# HG changeset patch # User lana # Date 1446759797 28800 # Node ID 42ca9d5434cccf5fdf9b64978b59bfb1b01e222b # Parent d811489c5649877f4ffa3891009a655bd4f39efa# Parent e4c76ac38b1219b31e86b18302590a513e250b30 Merge diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ * The class also makes sure that logger names of each Metro subsystem are consistent * with each other. * - * @author Marek Potociar + * @author Marek Potociar * @author Fabian Ritzmann */ public class Logger { @@ -335,7 +335,7 @@ /** * Method logs {@code exception}'s message as a {@code SEVERE} logging level * message. - *

+ *

* If {@code cause} parameter is not {@code null}, it is logged as well and * {@code exception} original cause is initialized with instance referenced * by {@code cause} parameter. @@ -363,7 +363,7 @@ /** * Method logs {@code exception}'s message as a {@code SEVERE} logging level * message. - *

+ *

* If {@code logCause} parameter is {@code true}, {@code exception}'s original * cause is logged as well (if exists). This may be used in cases when * {@code exception}'s class provides constructor to initialize the original @@ -408,7 +408,7 @@ /** * Method logs {@code exception}'s message at the logging level specified by the * {@code level} argument. - *

+ *

* If {@code cause} parameter is not {@code null}, it is logged as well and * {@code exception} original cause is initialized with instance referenced * by {@code cause} parameter. @@ -437,7 +437,7 @@ /** * Method logs {@code exception}'s message at the logging level specified by the * {@code level} argument. - *

+ *

* If {@code logCause} parameter is {@code true}, {@code exception}'s original * cause is logged as well (if exists). This may be used in cases when * {@code exception}'s class provides constructor to initialize the original diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,8 +48,6 @@ * @param field the field within the class to be accessed. * @param readOnly the isStatic value of the field's modifier. * @return Accessor the accessor for this field - * - * @throws JAXBException reports failures of the method. */ public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly) { return readOnly @@ -65,8 +63,6 @@ * @param readOnly the isStatic value of the field's modifier. * @param supressWarning supress security warning about accessing fields through reflection * @return Accessor the accessor for this field - * - * @throws JAXBException reports failures of the method. */ public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly, boolean supressWarning) { return readOnly @@ -81,8 +77,6 @@ * @param getter the getter method to be accessed. The value can be null. * @param setter the setter method to be accessed. The value can be null. * @return Accessor the accessor for these methods - * - * @throws JAXBException reports failures of the method. */ public Accessor createPropertyAccessor(Class bean, Method getter, Method setter) { if (getter == null) { diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,7 +81,7 @@ } /** - * Faster but less robust String->int conversion. + * Faster but less robust {@code String->int} conversion. * * Note that: *

} * * This can be used for generating schema components necessary for WSDL. * @@ -436,7 +436,7 @@ * to put additional JAXB type references into the {@link JAXBContext}. * *

- * The value of the property is {@link Collection}<{@link TypeReference}>. + * The value of the property is {@link Collection}{@code <}{@link TypeReference}{@code >}. * Those {@link TypeReference}s can then be used to create {@link Bridge}s. * *

@@ -453,7 +453,6 @@ * to enable the c14n marshalling support in the {@link JAXBContext}. * * Boolean - * @see C14nSupport_ArchitectureDocument * @since 2.0 EA2 */ public static final String CANONICALIZATION_SUPPORT = "com.sun.xml.internal.bind.c14n"; diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -78,15 +78,15 @@ * *

This code will produce the following document:

* - *

- * <?xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <Person>
- *   <name>Jane Smith</name>
- *   <date-of-birth>1965-05-23</date-of-birth>
- *   <citizenship>US</citizenship>
- * </Person>
- * 
+ * 
+ *   Jane Smith
+ *   1965-05-23
+ *   US
+ * 
+ * }

* *

This class inherits from {@link XMLWriter}, * and provides all of the same support for Namespaces.

diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ // - don't remove any existing method. /** - * Implemented by the user application to determine URI -> prefix + * Implemented by the user application to determine URI {@code ->} prefix * mapping. * * This is considered as an interface, though it's implemented diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,11 +91,11 @@ * *

The resulting document will look like this:

* - *

- * <?xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <greeting>Hello, world!</greeting>
- * 
+ * Hello, world!
+ * }

* *

In fact, there is an even simpler convenience method, * dataElement, designed for writing elements that @@ -125,9 +125,9 @@ * *

you will end up with

* - *

- * <item>1</item><item>3</item><item>3</item>
- *

+ *

{@code
+ * 133
+ * }

* *

You need to invoke one of the characters methods * explicitly to add newlines or indentation. Alternatively, you @@ -154,11 +154,11 @@ * *

The resulting document will look like this:

* - *

- * <?xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
- * 
+ * <_NS1:foo xmlns:_NS1="http://www.foo.com/ns/"/>
+ * }

* *

In many cases, document authors will prefer to choose their * own prefixes rather than using the (ugly) default names. The @@ -175,11 +175,11 @@ * *

The resulting document will look like this:

* - *

- * <?xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <foo:foo xmlns:foo="http://www.foo.com/ns/"/>
- * 
+ * 
+ * }

* *

The default Namespace simply uses an empty string as the prefix:

* @@ -192,28 +192,28 @@ * *

The resulting document will look like this:

* - *

- * <?xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <foo xmlns="http://www.foo.com/ns/"/>
- * 
+ * 
+ * }

* *

By default, the XML writer will not declare a Namespace until * it is actually used. Sometimes, this approach will create * a large number of Namespace declarations, as in the following * example:

* - *

- * <xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- *  <rdf:Description about="http://www.foo.com/ids/books/12345">
- *   <dc:title xmlns:dc="http://www.purl.org/dc/">A Dark Night</dc:title>
- *   <dc:creator xmlns:dc="http://www.purl.org/dc/">Jane Smith</dc:title>
- *   <dc:date xmlns:dc="http://www.purl.org/dc/">2000-09-09</dc:title>
- *  </rdf:Description>
- * </rdf:RDF>
- * 
+ * 
+ *  
+ *   A Dark Night
+ *   Jane Smith
+ *   2000-09-09
+ *  
+ * 
+ * }

* *

The "rdf" prefix is declared only once, because the RDF Namespace * is used by the root element and can be inherited by all of its @@ -230,18 +230,18 @@ * though it's not needed there, and can be inherited by its * descendants:

* - *

- * <xml version="1.0" standalone="yes"?>
+ * {@code
+ * 
  *
- * <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ * 
- *  <rdf:Description about="http://www.foo.com/ids/books/12345">
- *   <dc:title>A Dark Night</dc:title>
- *   <dc:creator>Jane Smith</dc:title>
- *   <dc:date>2000-09-09</dc:title>
- *  </rdf:Description>
- * </rdf:RDF>
- * 
+ *  
+ *   A Dark Night
+ *   Jane Smith
+ *   2000-09-09
+ *  
+ * 
+ * }

* *

This approach is also useful for declaring Namespace prefixes * that be used by qualified names appearing in attribute values or @@ -372,7 +372,7 @@ /** * Set whether the writer should print out the XML declaration - * (<?xml version='1.0' ... ?>). + * ({@code }). *

* This option is set to true by default. */ diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,25 +87,16 @@ if(consRef!=null) cons = consRef.get(); if(cons==null) { - cons = AccessController.doPrivileged(new PrivilegedAction>() { - @Override - public Constructor run() { - try { - return clazz.getDeclaredConstructor(emptyClass); - } catch (NoSuchMethodException e) { - logger.log(Level.INFO,"No default constructor found on "+clazz,e); - NoSuchMethodError exp; - if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) { - exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS - .format(clazz.getName())); - } else { - exp = new NoSuchMethodError(e.getMessage()); - } - exp.initCause(e); - throw exp; + if (System.getSecurityManager() == null) { + cons = tryGetDeclaredConstructor(clazz); + } else { + cons = AccessController.doPrivileged(new PrivilegedAction>() { + @Override + public Constructor run() { + return tryGetDeclaredConstructor(clazz); } - } - }); + }); + } int classMod = clazz.getModifiers(); @@ -126,6 +117,23 @@ return cons.newInstance(emptyObject); } + private static Constructor tryGetDeclaredConstructor(Class clazz) { + try { + return clazz.getDeclaredConstructor((Class[])emptyClass); + } catch (NoSuchMethodException e) { + logger.log(Level.INFO,"No default constructor found on "+clazz,e); + NoSuchMethodError exp; + if(clazz.getDeclaringClass()!=null && !Modifier.isStatic(clazz.getModifiers())) { + exp = new NoSuchMethodError(Messages.NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS + .format(clazz.getName())); + } else { + exp = new NoSuchMethodError(e.getMessage()); + } + exp.initCause(e); + throw exp; + } + } + /** * The same as {@link #create0} but with an error handling to make * the instantiation error fatal. diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -174,7 +174,7 @@ * @param retainPropertyInfo * @return * @throws JAXBException - * @deprecated use createContext(Class[] classes, Map properties) method instead + * @deprecated use {@code createContext(Class[] classes, Map properties)} method instead */ @Deprecated public static JAXBRIContext createContext( Class[] classes, @@ -201,7 +201,7 @@ * @param improvedXsiTypeHandling * @return * @throws JAXBException - * @deprecated use createContext( Class[] classes, Map properties) method instead + * @deprecated use {@code createContext( Class[] classes, Map properties)} method instead */ @Deprecated public static JAXBRIContext createContext( Class[] classes, diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,24 +38,18 @@ /** * @deprecated Use javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI instead; - * @return - * @throws CloneNotSupportedException */ @Deprecated() public static final String XML_SCHEMA = XMLConstants.W3C_XML_SCHEMA_NS_URI; /** * @deprecated Use javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI instead - * @return - * @throws CloneNotSupportedException */ @Deprecated() public static final String XML_SCHEMA_INSTANCE = XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI; /** * @deprecated Use javax.xml.XMLConstants.XML_NS_URI instead; - * @return - * @throws CloneNotSupportedException */ @Deprecated() public static final String XML_NAMESPACE_URI = XMLConstants.XML_NS_URI; diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,7 +72,7 @@ T getContentInMemoryType(); /** - * Returns the representation for {@link JAXBElement}<contentInMemoryType>. + * Returns the representation for {@link JAXBElement}{@code }. * *

* This returns the signature in Java and thus isn't affected by the adapter. @@ -80,7 +80,7 @@ T getType(); /** - * @inheritDoc + * {@inheritDoc} * * {@link ElementInfo} can only substitute {@link ElementInfo}. */ diff -r d811489c5649 -r 42ca9d5434cc jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java --- a/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java Thu Nov 05 08:15:39 2015 -0800 +++ b/jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java Thu Nov 05 13:43:17 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -51,14 +51,14 @@ * However, in a general case an element property can be heterogeneous, * meaning you can put different types in it, each with a different tag name * (and a few other settings.) - *

+     * 
      * // list can contain String or Integer.
-     * @XmlElements({
-     *   @XmlElement(name="a",type=String.class),
-     *   @XmlElement(name="b",type=Integer.class),
-     * }) {@code
-     * List

Overview

Evolution Rules

Evolution Rules

Performance Characteristics

Bootstrap Sequence

Tips: namespace URI -> package customization

Tips: namespace URI {@code -> } package customization

XJC Architecture Diagram

Overview