This commit is contained in:
Lana Steuck 2015-02-12 16:36:53 -08:00
commit b34ea60691
85 changed files with 713 additions and 790 deletions
jaxws/src
java.xml.bind/share/classes/javax/xml/bind
java.xml.ws/share/classes/com/sun/xml/internal/ws/util
jdk.xml.bind/share/classes/com/sun/tools/internal
jdk.xml.ws/share/classes/com/sun/tools/internal/ws

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -45,14 +45,14 @@ import java.io.InputStream;
* specialized forms of the method available:
*
* <ul>
* <li>{@link #newInstance(String,ClassLoader) JAXBContext.newInstance( "com.acme.foo:com.acme.bar" )} <br/>
* <li>{@link #newInstance(String,ClassLoader) JAXBContext.newInstance( "com.acme.foo:com.acme.bar" )} <br>
* The JAXBContext instance is initialized from a list of colon
* separated Java package names. Each java package contains
* JAXB mapped classes, schema-derived classes and/or user annotated
* classes. Additionally, the java package may contain JAXB package annotations
* that must be processed. (see JLS, Section 7.4.1 "Named Packages").
* </li>
* <li>{@link #newInstance(Class...) JAXBContext.newInstance( com.acme.foo.Foo.class )} <br/>
* <li>{@link #newInstance(Class...) JAXBContext.newInstance( com.acme.foo.Foo.class )} <br>
* The JAXBContext instance is initialized with class(es)
* passed as parameter(s) and classes that are statically reachable from
* these class(es). See {@link #newInstance(Class...)} for details.
@ -64,8 +64,8 @@ import java.io.InputStream;
* class containing the following method signatures:</i>
*
* <pre>
* public static JAXBContext createContext( String contextPath, ClassLoader classLoader, Map&lt;String,Object> properties ) throws JAXBException
* public static JAXBContext createContext( Class[] classes, Map&lt;String,Object> properties ) throws JAXBException
* public static JAXBContext createContext( String contextPath, ClassLoader classLoader, Map&lt;String,Object&gt; properties ) throws JAXBException
* public static JAXBContext createContext( Class[] classes, Map&lt;String,Object&gt; properties ) throws JAXBException
* </pre>
*
* <p><i>
@ -256,7 +256,7 @@ import java.io.InputStream;
* @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
* @see Marshaller
* @see Unmarshaller
* @see S 7.4.1 "Named Packages" in Java Language Specification</a>
* @see <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-7.html#jls-7.4.1">S 7.4.1 "Named Packages" in Java Language Specification</a>
* @since 1.6, JAXB 1.0
*/
public abstract class JAXBContext {
@ -352,7 +352,7 @@ public abstract class JAXBContext {
* <p>
* To maintain compatibility with JAXB 1.0 schema to java
* interface/implementation binding, enabled by schema customization
* <tt>&lt;jaxb:globalBindings valueClass="false"></tt>,
* <tt>&lt;jaxb:globalBindings valueClass="false"&gt;</tt>,
* the JAXB provider will ensure that each package on the context path
* has a <tt>jaxb.properties</tt> file which contains a value for the
* <tt>javax.xml.bind.context.factory</tt> property and that all values

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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,7 +48,7 @@ public class JAXBException extends Exception {
* Exception reference
*
*/
private Throwable linkedException;
private volatile Throwable linkedException;
static final long serialVersionUID = -5621384651494307979L;
@ -133,7 +133,7 @@ public class JAXBException extends Exception {
* indicates that the linked exception does not exist or
* is unknown).
*/
public synchronized void setLinkedException( Throwable exception ) {
public void setLinkedException( Throwable exception ) {
this.linkedException = exception;
}

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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,7 +51,7 @@ public abstract class JAXBIntrospector {
* <ol>
* <li>It is an instance of <code>javax.xml.bind.JAXBElement</code>.</li>
* <li>The class of <code>object</code> is annotated with
* <code>&#64XmlRootElement</code>.
* <code>&#64;XmlRootElement</code>.
* </li>
* </ol>
*
@ -74,7 +74,7 @@ public abstract class JAXBIntrospector {
*
* <p>Convenience method to abstract whether working with either
* a javax.xml.bind.JAXBElement instance or an instance of
* <tt>&#64XmlRootElement</tt> annotated Java class.</p>
* <tt>&#64;XmlRootElement</tt> annotated Java class.</p>
*
* @param jaxbElement object that #isElement(Object) returns true.
*

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -175,7 +175,7 @@ import java.io.File;
* encoding used during these marshal operations. Client applications are
* expected to supply a valid character encoding name as defined in the
* <a href="http://www.w3.org/TR/2000/REC-xml-20001006#charencoding">W3C XML 1.0
* Recommendation</a> and supported by your Java Platform</a>.
* Recommendation</a> and supported by your Java Platform.
* </blockquote>
*
* <p>
@ -664,7 +664,7 @@ public interface Marshaller {
*
* <p>
* Every marshaller internally maintains a
* {@link java.util.Map}&lt;{@link Class},{@link XmlAdapter}>,
* {@link java.util.Map}&lt;{@link Class},{@link XmlAdapter}&gt;,
* which it uses for marshalling classes whose fields/methods are annotated
* with {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
*
@ -750,17 +750,17 @@ public interface Marshaller {
public Schema getSchema();
/**
* <p/>
* <p>
* Register an instance of an implementation of this class with a {@link Marshaller} to externally listen
* for marshal events.
* <p/>
* <p/>
* </p>
* <p>
* This class enables pre and post processing of each marshalled object.
* The event callbacks are called when marshalling from an instance that maps to an xml element or
* complex type definition. The event callbacks are not called when marshalling from an instance of a
* Java datatype that represents a simple type definition.
* <p/>
* <p/>
* </p>
* <p>
* External listener is one of two different mechanisms for defining marshal event callbacks.
* See <a href="Marshaller.html#marshalEventCallback">Marshal Event Callbacks</a> for an overview.
*
@ -770,10 +770,10 @@ public interface Marshaller {
*/
public static abstract class Listener {
/**
* <p/>
* <p>
* Callback method invoked before marshalling from <tt>source</tt> to XML.
* <p/>
* <p/>
* </p>
* <p>
* This method is invoked just before marshalling process starts to marshal <tt>source</tt>.
* Note that if the class of <tt>source</tt> defines its own <tt>beforeMarshal</tt> method,
* the class specific callback method is invoked just before this method is invoked.
@ -784,10 +784,10 @@ public interface Marshaller {
}
/**
* <p/>
* <p>
* Callback method invoked after marshalling <tt>source</tt> to XML.
* <p/>
* <p/>
* </p>
* <p>
* This method is invoked after <tt>source</tt> and all its descendants have been marshalled.
* Note that if the class of <tt>source</tt> defines its own <tt>afterMarshal</tt> method,
* the class specific callback method is invoked just before this method is invoked.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -70,11 +70,11 @@ public abstract class SchemaOutputResolver {
*
* If the {@link Result} object has a system ID, it must be an
* absolute system ID. Those system IDs are relativized by the caller and used
* for &lt;xs:import> statements.
* for &lt;xs:import&gt; statements.
*
* If the {@link Result} object does not have a system ID, a schema
* for the namespace URI is generated but it won't be explicitly
* &lt;xs:import>ed from other schemas.
* &lt;xs:import&gt;ed from other schemas.
*
* If {@code null} is returned, the schema generation for this
* namespace URI will be skipped.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -57,8 +57,9 @@ public class TypeConstraintException extends java.lang.RuntimeException {
* Exception reference
*
*/
private Throwable linkedException;
private volatile Throwable linkedException;
static final long serialVersionUID = -3059799699420143848L;
/**
* Construct a TypeConstraintException with the specified detail message. The
@ -141,7 +142,7 @@ public class TypeConstraintException extends java.lang.RuntimeException {
* indicates that the linked exception does not exist or
* is unknown).
*/
public synchronized void setLinkedException( Throwable exception ) {
public void setLinkedException( Throwable exception ) {
this.linkedException = exception;
}

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -238,13 +238,12 @@ import java.io.Reader;
* to a JAXB mapped class by {@link JAXBContext}, that the root
* element's <tt>xsi:type</tt> attribute takes
* precedence over the unmarshal methods <tt>declaredType</tt> parameter.
* These methods always return a <tt>JAXBElement&lt;declaredType></tt>
* These methods always return a <tt>JAXBElement&lt;declaredType&gt;</tt>
* instance. The table below shows how the properties of the returned JAXBElement
* instance are set.
*
* <a name="unmarshalDeclaredTypeReturn"></a>
* <p>
* <table border="2" rules="all" cellpadding="4">
* <table summary="" border="2" rules="all" cellpadding="4">
* <thead>
* <tr>
* <th align="center" colspan="2">
@ -284,19 +283,19 @@ import java.io.Reader;
* <blockquote>
* <pre>
* Schema fragment for example
* &lt;xs:schema>
* &lt;xs:complexType name="FooType">...&lt;\xs:complexType>
* &lt;!-- global element declaration "PurchaseOrder" -->
* &lt;xs:element name="PurchaseOrder">
* &lt;xs:complexType>
* &lt;xs:sequence>
* &lt;!-- local element declaration "foo" -->
* &lt;xs:element name="foo" type="FooType"/>
* &lt;xs:schema&gt;
* &lt;xs:complexType name="FooType"&gt;...&lt;\xs:complexType&gt;
* &lt;!-- global element declaration "PurchaseOrder" --&gt;
* &lt;xs:element name="PurchaseOrder"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:sequence&gt;
* &lt;!-- local element declaration "foo" --&gt;
* &lt;xs:element name="foo" type="FooType"/&gt;
* ...
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;/xs:element>
* &lt;/xs:schema>
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* &lt;/xs:element&gt;
* &lt;/xs:schema&gt;
*
* JAXBContext jc = JAXBContext.newInstance( "com.acme.foo" );
* Unmarshaller u = jc.createUnmarshaller();
@ -309,7 +308,7 @@ import java.io.Reader;
* // local element declaration in schema.
*
* // FooType is the JAXB mapping of the type of local element declaration foo.
* JAXBElement&lt;FooType> foo = u.unmarshal( fooSubtree, FooType.class);
* JAXBElement&lt;FooType&gt; foo = u.unmarshal( fooSubtree, FooType.class);
* </pre>
* </blockquote>
*
@ -390,7 +389,7 @@ import java.io.Reader;
* The external listener callback mechanism enables the registration of a {@link Listener}
* instance with an {@link Unmarshaller#setListener(Listener)}. The external listener receives all callback events,
* allowing for more centralized processing than per class defined callback methods. The external listener
* receives events when unmarshalling proces is marshalling to a JAXB element or to JAXB mapped class.
* receives events when unmarshalling process is marshalling to a JAXB element or to JAXB mapped class.
* <p>
* The 'class defined' and external listener event callback methods are independent of each other,
* both can be called for one event. The invocation ordering when both listener callback methods exist is
@ -1010,7 +1009,7 @@ public interface Unmarshaller {
*
* <p>
* Every unmarshaller internally maintains a
* {@link java.util.Map}&lt;{@link Class},{@link XmlAdapter}>,
* {@link java.util.Map}&lt;{@link Class},{@link XmlAdapter}&gt;,
* which it uses for unmarshalling classes whose fields/methods are annotated
* with {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
*
@ -1050,7 +1049,6 @@ public interface Unmarshaller {
/**
* <p>Associate a context that resolves cid's, content-id URIs, to
* binary data passed as attachments.</p>
* <p/>
* <p>Unmarshal time validation, enabled via {@link #setSchema(Schema)},
* must be supported even when unmarshaller is performing XOP processing.
* </p>
@ -1063,21 +1061,21 @@ public interface Unmarshaller {
AttachmentUnmarshaller getAttachmentUnmarshaller();
/**
* <p/>
* <p>
* Register an instance of an implementation of this class with {@link Unmarshaller} to externally listen
* for unmarshal events.
* <p/>
* <p/>
* </p>
* <p>
* This class enables pre and post processing of an instance of a JAXB mapped class
* as XML data is unmarshalled into it. The event callbacks are called when unmarshalling
* XML content into a JAXBElement instance or a JAXB mapped class that represents a complex type definition.
* The event callbacks are not called when unmarshalling to an instance of a
* Java datatype that represents a simple type definition.
* <p/>
* <p/>
* </p>
* <p>
* External listener is one of two different mechanisms for defining unmarshal event callbacks.
* See <a href="Unmarshaller.html#unmarshalEventCallback">Unmarshal Event Callbacks</a> for an overview.
* <p/>
* </p>
* (@link #setListener(Listener)}
* (@link #getListener()}
*
@ -1085,10 +1083,10 @@ public interface Unmarshaller {
*/
public static abstract class Listener {
/**
* <p/>
* <p>
* Callback method invoked before unmarshalling into <tt>target</tt>.
* <p/>
* <p/>
* </p>
* <p>
* This method is invoked immediately after <tt>target</tt> was created and
* before the unmarshalling of this object begins. Note that
* if the class of <tt>target</tt> defines its own <tt>beforeUnmarshal</tt> method,
@ -1102,10 +1100,10 @@ public interface Unmarshaller {
}
/**
* <p/>
* <p>
* Callback method invoked after unmarshalling XML data into <tt>target</tt>.
* <p/>
* <p/>
* </p>
* <p>
* This method is invoked after all the properties (except IDREF) are unmarshalled into <tt>target</tt>,
* but before <tt>target</tt> is set into its <tt>parent</tt> object.
* Note that if the class of <tt>target</tt> defines its own <tt>afterUnmarshal</tt> method,

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -62,7 +62,7 @@ import static java.lang.annotation.ElementType.METHOD;
* each attribute that is not statically associated with another
* JavaBean property, via {@link XmlAttribute}, is entered into the
* wildcard attribute map represented by
* {@link Map}&lt;{@link QName},{@link Object}>. The attribute QName is the
* {@link Map}&lt;{@link QName},{@link Object}&gt;. The attribute QName is the
* map's key. The key's value is the String value of the attribute.
*
* @author Kohsuke Kawaguchi, Sun Microsystems, Inc.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -50,7 +50,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* annotation for the other JavaBean properties on the class, is added to this
* "catch-all" property.
*
* <p>
* <h2>Usages:</h2>
* <pre>
* &#64;XmlAnyElement
@ -61,7 +60,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* public {@link Object}[] others;
*
* &#64;XmlAnyElement
* private List&lt;{@link Element}> nodes;
* private List&lt;{@link Element}&gt; nodes;
*
* &#64;XmlAnyElement
* private {@link Element} node;
@ -88,7 +87,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* <pre>
* // List of java.lang.String or DOM nodes.
* &#64;XmlAnyElement &#64;XmlMixed
* List&lt;Object> others;
* List&lt;Object&gt; others;
* </pre>
*
*
@ -96,13 +95,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
*
* The following schema would produce the following Java class:
* <pre>
* &lt;xs:complexType name="foo">
* &lt;xs:sequence>
* &lt;xs:element name="a" type="xs:int" />
* &lt;xs:element name="b" type="xs:int" />
* &lt;xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;xs:complexType name="foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="a" type="xs:int" /&gt;
* &lt;xs:element name="b" type="xs:int" /&gt;
* &lt;xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <pre>
@ -110,35 +109,35 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* int a;
* int b;
* &#64;{@link XmlAnyElement}
* List&lt;Element> any;
* List&lt;Element&gt; any;
* }
* </pre>
*
* It can unmarshal instances like
*
* <pre>
* &lt;foo xmlns:e="extra">
* &lt;a>1</a>
* &lt;e:other /> // this will be bound to DOM, because unmarshalling is orderless
* &lt;b>3</b>
* &lt;e:other />
* &lt;c>5</c> // this will be bound to DOM, because the annotation doesn't remember namespaces.
* &lt;/foo>
* &lt;foo xmlns:e="extra"&gt;
* &lt;a&gt;1&lt;/a&gt;
* &lt;e:other /&gt; // this will be bound to DOM, because unmarshalling is orderless
* &lt;b&gt;3&lt;/b&gt;
* &lt;e:other /&gt;
* &lt;c&gt;5&lt;/c&gt; // this will be bound to DOM, because the annotation doesn't remember namespaces.
* &lt;/foo&gt;
* </pre>
*
*
*
* The following schema would produce the following Java class:
* <pre>
* &lt;xs:complexType name="bar">
* &lt;xs:complexContent>
* &lt;xs:extension base="foo">
* &lt;xs:sequence>
* &lt;xs:element name="c" type="xs:int" />
* &lt;xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
* &lt;/xs:sequence>
* &lt;/xs:extension>
* &lt;/xs:complexType>
* &lt;xs:complexType name="bar"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:extension base="foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="c" type="xs:int" /&gt;
* &lt;xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:extension&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <pre>
@ -152,14 +151,14 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* It can unmarshal instances like
*
* <pre>
* &lt;bar xmlns:e="extra">
* &lt;a>1</a>
* &lt;e:other /> // this will be bound to DOM, because unmarshalling is orderless
* &lt;b>3</b>
* &lt;e:other />
* &lt;c>5</c> // this now goes to Bar.c
* &lt;e:other /> // this will go to Foo.any
* &lt;/bar>
* &lt;bar xmlns:e="extra"&gt;
* &lt;a&gt;1&lt;/a&gt;
* &lt;e:other /&gt; // this will be bound to DOM, because unmarshalling is orderless
* &lt;b&gt;3&lt;/b&gt;
* &lt;e:other /&gt;
* &lt;c&gt;5&lt;/c&gt; // this now goes to Bar.c
* &lt;e:other /&gt; // this will go to Foo.any
* &lt;/bar&gt;
* </pre>
*
*
@ -173,13 +172,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* <p>
* The following schema would produce the following Java class:
* <pre>
* &lt;xs:complexType name="foo">
* &lt;xs:choice maxOccurs="unbounded" minOccurs="0">
* &lt;xs:element name="a" type="xs:int" />
* &lt;xs:element name="b" type="xs:int" />
* &lt;xs:any namespace="##other" processContents="lax" />
* &lt;/xs:choice>
* &lt;/xs:complexType>
* &lt;xs:complexType name="foo"&gt;
* &lt;xs:choice maxOccurs="unbounded" minOccurs="0"&gt;
* &lt;xs:element name="a" type="xs:int" /&gt;
* &lt;xs:element name="b" type="xs:int" /&gt;
* &lt;xs:any namespace="##other" processContents="lax" /&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <pre>
@ -189,27 +188,27 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* &#64;{@link XmlElementRef}(name="a", type="JAXBElement.class")
* &#64;{@link XmlElementRef}(name="b", type="JAXBElement.class")
* })
* {@link List}&lt;{@link Object}> others;
* {@link List}&lt;{@link Object}&gt; others;
* }
*
* &#64;XmlRegistry
* class ObjectFactory {
* ...
* &#64;XmlElementDecl(name = "a", namespace = "", scope = Foo.class)
* {@link JAXBElement}&lt;Integer> createFooA( Integer i ) { ... }
* {@link JAXBElement}&lt;Integer&gt; createFooA( Integer i ) { ... }
*
* &#64;XmlElementDecl(name = "b", namespace = "", scope = Foo.class)
* {@link JAXBElement}&lt;Integer> createFooB( Integer i ) { ... }
* {@link JAXBElement}&lt;Integer&gt; createFooB( Integer i ) { ... }
* </pre>
*
* It can unmarshal instances like
*
* <pre>
* &lt;foo xmlns:e="extra">
* &lt;a>1</a> // this will unmarshal to a {@link JAXBElement} instance whose value is 1.
* &lt;e:other /> // this will unmarshal to a DOM {@link Element}.
* &lt;b>3</b> // this will unmarshal to a {@link JAXBElement} instance whose value is 1.
* &lt;/foo>
* &lt;foo xmlns:e="extra"&gt;
* &lt;a&gt;1&lt;/a&gt; // this will unmarshal to a {@link JAXBElement} instance whose value is 1.
* &lt;e:other /&gt; // this will unmarshal to a DOM {@link Element}.
* &lt;b&gt;3&lt;/b&gt; // this will unmarshal to a {@link JAXBElement} instance whose value is 1.
* &lt;/foo&gt;
* </pre>
*
*
@ -227,10 +226,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* </pre>
* then the following document will unmarshal like this:
* <pre>
* &lt;foo>
* &lt;unknown />
* &lt;foo />
* &lt;/foo>
* &lt;foo&gt;
* &lt;unknown /&gt;
* &lt;foo /&gt;
* &lt;/foo&gt;
*
* Foo foo = unmarshal();
* // 1 for 'unknown', another for 'foo'

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -52,14 +52,14 @@ import java.lang.annotation.Target;
* </pre>
* The above code maps to the following XML:
* <pre>
* &lt;xs:element name="foo" xmlns:ref="http://ws-i.org/profiles/basic/1.1/xsd">
* &lt;xs:complexType>
* &lt;xs:sequence>
* &lt;xs:element name="body" type="ref:swaRef" minOccurs="0" />
* &lt;/xs:sequence>
* &lt;xs:attribute name="data" type="ref:swaRef" use="optional" />
* &lt;/xs:complexType>
* &lt;/xs:element>
* &lt;xs:element name="foo" xmlns:ref="http://ws-i.org/profiles/basic/1.1/xsd"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="body" type="ref:swaRef" minOccurs="0" /&gt;
* &lt;/xs:sequence&gt;
* &lt;xs:attribute name="data" type="ref:swaRef" use="optional" /&gt;
* &lt;/xs:complexType&gt;
* &lt;/xs:element&gt;
* </pre>
*
* <p>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -56,8 +56,8 @@ import static java.lang.annotation.RetentionPolicy.*;
* simple type.
* <pre>
* // Examples
* &#64;XmlAttribute List&lt;Integer> items; //legal
* &#64;XmlAttribute List&lt;Bar> foo; // illegal if Bar does not map to a schema simple type
* &#64;XmlAttribute List&lt;Integer&gt; items; //legal
* &#64;XmlAttribute List&lt;Bar&gt; foo; // illegal if Bar does not map to a schema simple type
* </pre>
* </li>
* <li> If the type of the field or the property is a non
@ -80,7 +80,6 @@ import static java.lang.annotation.RetentionPolicy.*;
* {@link XmlInlineBinaryData},
* {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.</li>
* </ul>
* </p>
*
* <p> <b>Example 1: </b>Map a JavaBean property to an XML attribute.</p>
* <pre>
@ -91,12 +90,12 @@ import static java.lang.annotation.RetentionPolicy.*;
* public void setPrice(java.math.BigDecimal ) {...};
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="USPrice">
* &lt;xs:sequence>
* &lt;/xs:sequence>
* &lt;xs:attribute name="price" type="xs:decimal"/>
* &lt;/xs:complexType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="USPrice"&gt;
* &lt;xs:sequence&gt;
* &lt;/xs:sequence&gt;
* &lt;xs:attribute name="price" type="xs:decimal"/&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p> <b>Example 2: </b>Map a JavaBean property to an XML attribute with anonymous type.</p>
@ -107,17 +106,17 @@ import static java.lang.annotation.RetentionPolicy.*;
* // Example: Code fragment
* class Foo {
* ...
* &#64;XmlAttribute List&lt;Integer> items;
* &#64;XmlAttribute List&lt;Integer&gt; items;
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="foo">
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="foo"&gt;
* ...
* &lt;xs:attribute name="items">
* &lt;xs:simpleType>
* &lt;xs:list itemType="xs:int"/>
* &lt;/xs:simpleType>
* &lt;/xs:complexType>
* &lt;xs:attribute name="items"&gt;
* &lt;xs:simpleType&gt;
* &lt;xs:list itemType="xs:int"/&gt;
* &lt;/xs:simpleType&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
* @author Sekhar Vajjhala, Sun Microsystems, Inc.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -83,12 +83,12 @@ import static java.lang.annotation.RetentionPolicy.*;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example: Local XML Schema element -->
* &lt;xs:complexType name="USPrice"/>
* &lt;xs:sequence>
* &lt;xs:element name="itemprice" type="xs:decimal" minOccurs="0"/>
* &lt;/sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: Local XML Schema element --&gt;
* &lt;xs:complexType name="USPrice"/&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="itemprice" type="xs:decimal" minOccurs="0"/&gt;
* &lt;/sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
* <p>
*
@ -101,12 +101,12 @@ import static java.lang.annotation.RetentionPolicy.*;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example: Local XML Schema element -->
* &lt;xs:complexType name="USPrice">
* &lt;xs:sequence>
* &lt;xs:element name="price" type="xs:decimal" nillable="true" minOccurs="0"/>
* &lt;/sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: Local XML Schema element --&gt;
* &lt;xs:complexType name="USPrice"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="price" type="xs:decimal" nillable="true" minOccurs="0"/&gt;
* &lt;/sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
* <p>
* <b> Example 3: </b> Map a field to a nillable, required element.
@ -118,14 +118,13 @@ import static java.lang.annotation.RetentionPolicy.*;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example: Local XML Schema element -->
* &lt;xs:complexType name="USPrice">
* &lt;xs:sequence>
* &lt;xs:element name="price" type="xs:decimal" nillable="true" minOccurs="1"/>
* &lt;/sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: Local XML Schema element --&gt;
* &lt;xs:complexType name="USPrice"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="price" type="xs:decimal" nillable="true" minOccurs="1"/&gt;
* &lt;/sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
* <p>
*
* <p> <b>Example 4: </b>Map a JavaBean property to an XML element
* with anonymous type.</p>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -62,23 +62,23 @@ import static java.lang.annotation.ElementType.METHOD;
* &#64;XmlRegistry
* class ObjectFactory {
* &#64;XmlElementDecl(name="foo")
* JAXBElement&lt;String> createFoo(String s) { ... }
* JAXBElement&lt;String&gt; createFoo(String s) { ... }
* }
* </pre>
* <pre>
* &lt;!-- XML input -->
* &lt;foo>string</foo>
* &lt;!-- XML input --&gt;
* &lt;foo&gt;string&lt;/foo&gt;
*
* // Example: code fragment corresponding to XML input
* JAXBElement<String> o =
* (JAXBElement<String>)unmarshaller.unmarshal(aboveDocument);
* JAXBElement&lt;String&gt; o =
* (JAXBElement&lt;String&gt;)unmarshaller.unmarshal(aboveDocument);
* // print JAXBElement instance to show values
* System.out.println(o.getName()); // prints "{}foo"
* System.out.println(o.getValue()); // prints "string"
* System.out.println(o.getValue().getClass()); // prints "java.lang.String"
*
* &lt;!-- Example: XML schema definition -->
* &lt;xs:element name="foo" type="xs:string"/>
* &lt;!-- Example: XML schema definition --&gt;
* &lt;xs:element name="foo" type="xs:string"/&gt;
* </pre>
*
* <p><b>Example 2: </b> Element declaration with non local scope
@ -91,16 +91,16 @@ import static java.lang.annotation.ElementType.METHOD;
* this javadoc.
*
* <pre>
* &lt;!-- Example: XML schema definition -->
* &lt;xs:schema>
* &lt;xs:complexType name="pea">
* &lt;xs:choice maxOccurs="unbounded">
* &lt;xs:element name="foo" type="xs:string"/>
* &lt;xs:element name="bar" type="xs:string"/>
* &lt;/xs:choice>
* &lt;/xs:complexType>
* &lt;xs:element name="foo" type="xs:int"/>
* &lt;/xs:schema>
* &lt;!-- Example: XML schema definition --&gt;
* &lt;xs:schema&gt;
* &lt;xs:complexType name="pea"&gt;
* &lt;xs:choice maxOccurs="unbounded"&gt;
* &lt;xs:element name="foo" type="xs:string"/&gt;
* &lt;xs:element name="bar" type="xs:string"/&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:complexType&gt;
* &lt;xs:element name="foo" type="xs:int"/&gt;
* &lt;/xs:schema&gt;
* </pre>
* <pre>
* // Example: expected default binding
@ -109,19 +109,19 @@ import static java.lang.annotation.ElementType.METHOD;
* &#64;XmlElementRef(name="foo",type=JAXBElement.class)
* &#64;XmlElementRef(name="bar",type=JAXBElement.class)
* })
* List&lt;JAXBElement&lt;String>> fooOrBar;
* List&lt;JAXBElement&lt;String&gt;&gt; fooOrBar;
* }
*
* &#64;XmlRegistry
* class ObjectFactory {
* &#64;XmlElementDecl(scope=Pea.class,name="foo")
* JAXBElement<String> createPeaFoo(String s);
* JAXBElement&lt;String&gt; createPeaFoo(String s);
*
* &#64;XmlElementDecl(scope=Pea.class,name="bar")
* JAXBElement<String> createPeaBar(String s);
* JAXBElement&lt;String&gt; createPeaBar(String s);
*
* &#64;XmlElementDecl(name="foo")
* JAXBElement<Integer> createFoo(Integer i);
* JAXBElement&lt;Integer&gt; createFoo(Integer i);
* }
*
* </pre>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -57,8 +57,8 @@ import static java.lang.annotation.ElementType.METHOD;
* (section 5.5.5, "Element Property" of JAXB 2.0 specification). An
* element property method signature is of the form:
* <pre>
* public void setTerm(JAXBElement<? extends Operator>);
* public JAXBElement<? extends Operator> getTerm();
* public void setTerm(JAXBElement&lt;? extends Operator&gt;);
* public JAXBElement&lt;? extends Operator&gt; getTerm();
* </pre>
* <p>
* An element factory method annotated with {@link XmlElementDecl} is
@ -106,7 +106,7 @@ import static java.lang.annotation.ElementType.METHOD;
* // element name will be derived from the &#64;XmlRootElement
* // annotation on the type (for e.g. "jar" for JarTask).
* &#64;XmlElementRef
* List&lt;Task> tasks;
* List&lt;Task&gt; tasks;
* }
*
* abstract class Task {
@ -122,16 +122,16 @@ import static java.lang.annotation.ElementType.METHOD;
* ...
* }
*
* &lt;!-- XML Schema fragment -->
* &lt;xs:element name="target" type="Target">
* &lt;xs:complexType name="Target">
* &lt;xs:sequence>
* &lt;xs:choice maxOccurs="unbounded">
* &lt;xs:element ref="jar">
* &lt;xs:element ref="javac">
* &lt;/xs:choice>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema fragment --&gt;
* &lt;xs:element name="target" type="Target"&gt;
* &lt;xs:complexType name="Target"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:choice maxOccurs="unbounded"&gt;
* &lt;xs:element ref="jar"&gt;
* &lt;xs:element ref="javac"&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
* <p>
@ -144,14 +144,14 @@ import static java.lang.annotation.ElementType.METHOD;
* </pre>
* will produce the following XML output:
* <pre>
* &lt;target>
* &lt;jar>
* &lt;target&gt;
* &lt;jar&gt;
* ....
* &lt;/jar>
* &lt;javac>
* &lt;/jar&gt;
* &lt;javac&gt;
* ....
* &lt;/javac>
* &lt;/target>
* &lt;/javac&gt;
* &lt;/target&gt;
* </pre>
* <p>
* It is not an error to have a class that extends <tt>Task</tt>
@ -182,17 +182,17 @@ import static java.lang.annotation.ElementType.METHOD;
* // substituted in the XML document.
* //
* &#64;XmlElementRef(type=JAXBElement.class,name="operator")
* JAXBElement&lt;? extends Operator> term;
* JAXBElement&lt;? extends Operator&gt; term;
* }
*
* &#64;XmlRegistry
* class ObjectFactory {
* &#64;XmlElementDecl(name="operator")
* JAXBElement&lt;Operator> createOperator(Operator o) {...}
* JAXBElement&lt;Operator&gt; createOperator(Operator o) {...}
* &#64;XmlElementDecl(name="add",substitutionHeadName="operator")
* JAXBElement&lt;Operator> createAdd(Operator o) {...}
* JAXBElement&lt;Operator&gt; createAdd(Operator o) {...}
* &#64;XmlElementDecl(name="sub",substitutionHeadName="operator")
* JAXBElement&lt;Operator> createSub(Operator o) {...}
* JAXBElement&lt;Operator&gt; createSub(Operator o) {...}
* }
*
* class Operator {
@ -208,9 +208,9 @@ import static java.lang.annotation.ElementType.METHOD;
* </pre>
* will produce the following XML output:
* <pre>
* &lt;math>
* &lt;add>...&lt;/add>
* &lt;/math>
* &lt;math&gt;
* &lt;add&gt;...&lt;/add&gt;
* &lt;/math&gt;
* </pre>
*
*

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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,15 +44,15 @@ import java.lang.annotation.Target;
* int[] names;
*
* // XML Serialization Form 1 (Unwrapped collection)
* &lt;names> ... &lt;/names>
* &lt;names> ... &lt;/names>
* &lt;names&gt; ... &lt;/names&gt;
* &lt;names&gt; ... &lt;/names&gt;
*
* // XML Serialization Form 2 ( Wrapped collection )
* &lt;wrapperElement>
* &lt;names> value-of-item &lt;/names>
* &lt;names> value-of-item &lt;/names>
* &lt;wrapperElement&gt;
* &lt;names&gt; value-of-item &lt;/names&gt;
* &lt;names&gt; value-of-item &lt;/names&gt;
* ....
* &lt;/wrapperElement>
* &lt;/wrapperElement&gt;
* </pre>
*
* <p> The two serialized XML forms allow a null collection to be

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -83,21 +83,21 @@ import java.lang.annotation.Target;
* }
*
* &lt;!-- XML Representation for a List of {1,2.5}
* XML output is not wrapped using another element -->
* XML output is not wrapped using another element --&gt;
* ...
* &lt;A> 1 &lt;/A>
* &lt;B> 2.5 &lt;/B>
* &lt;A&gt; 1 &lt;/A&gt;
* &lt;B&gt; 2.5 &lt;/B&gt;
* ...
*
* &lt;!-- XML Schema fragment -->
* &lt;xs:complexType name="Foo">
* &lt;xs:sequence>
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded">
* &lt;xs:element name="A" type="xs:int"/>
* &lt;xs:element name="B" type="xs:float"/>
* &lt;xs:choice>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema fragment --&gt;
* &lt;xs:complexType name="Foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded"&gt;
* &lt;xs:element name="A" type="xs:int"/&gt;
* &lt;xs:element name="B" type="xs:float"/&gt;
* &lt;xs:choice&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
*
@ -115,19 +115,19 @@ import java.lang.annotation.Target;
* public List items;
* }
*
* &lt;!-- XML Schema fragment -->
* &lt;xs:complexType name="Foo">
* &lt;xs:sequence>
* &lt;xs:element name="bar">
* &lt;xs:complexType>
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded">
* &lt;xs:element name="A" type="xs:int"/>
* &lt;xs:element name="B" type="xs:float"/>
* &lt;/xs:choice>
* &lt;/xs:complexType>
* &lt;/xs:element>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema fragment --&gt;
* &lt;xs:complexType name="Foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="bar"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded"&gt;
* &lt;xs:element name="A" type="xs:int"/&gt;
* &lt;xs:element name="B" type="xs:float"/&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:complexType&gt;
* &lt;/xs:element&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p><b>Example 3:</b> Change element name based on type using an adapter.
@ -146,19 +146,19 @@ import java.lang.annotation.Target;
* &#64;XmlType(name="PX") class PX extends P {...}
* &#64;XmlType(name="PY") class PY extends P {...}
*
* &lt;!-- XML Schema fragment -->
* &lt;xs:complexType name="Foo">
* &lt;xs:sequence>
* &lt;xs:element name="bar">
* &lt;xs:complexType>
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded">
* &lt;xs:element name="A" type="PX"/>
* &lt;xs:element name="B" type="PY"/>
* &lt;/xs:choice>
* &lt;/xs:complexType>
* &lt;/xs:element>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema fragment --&gt;
* &lt;xs:complexType name="Foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="bar"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded"&gt;
* &lt;xs:element name="A" type="PX"/&gt;
* &lt;xs:element name="B" type="PY"/&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:complexType&gt;
* &lt;/xs:element&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -56,23 +56,23 @@ import static java.lang.annotation.ElementType.FIELD;
* <p> In the absence of this annotation, {@link Enum#name()} is used
* as the XML representation.
*
* <p> <b>Example 1: </b>Map enum constant name -> enumeration facet</p>
* <p> <b>Example 1: </b>Map enum constant name -&gt; enumeration facet</p>
* <pre>
* //Example: Code fragment
* &#64;XmlEnum(String.class)
* public enum Card { CLUBS, DIAMONDS, HEARTS, SPADES }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:simpleType name="Card">
* &lt;xs:restriction base="xs:string"/>
* &lt;xs:enumeration value="CLUBS"/>
* &lt;xs:enumeration value="DIAMONDS"/>
* &lt;xs:enumeration value="HEARTS"/>
* &lt;xs:enumeration value="SPADES"/>
* &lt;/xs:simpleType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:simpleType name="Card"&gt;
* &lt;xs:restriction base="xs:string"/&gt;
* &lt;xs:enumeration value="CLUBS"/&gt;
* &lt;xs:enumeration value="DIAMONDS"/&gt;
* &lt;xs:enumeration value="HEARTS"/&gt;
* &lt;xs:enumeration value="SPADES"/&gt;
* &lt;/xs:simpleType&gt;
* </pre>
*
* <p><b>Example 2: </b>Map enum constant name(value) -> enumeration facet </p>
* <p><b>Example 2: </b>Map enum constant name(value) -&gt; enumeration facet </p>
* <pre>
* //Example: code fragment
* &#64;XmlType
@ -83,18 +83,18 @@ import static java.lang.annotation.ElementType.FIELD;
* &#64;XmlEnumValue("10") DIME(10),
* &#64;XmlEnumValue("25") QUARTER(25) }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:simpleType name="Coin">
* &lt;xs:restriction base="xs:int">
* &lt;xs:enumeration value="1"/>
* &lt;xs:enumeration value="5"/>
* &lt;xs:enumeration value="10"/>
* &lt;xs:enumeration value="25"/>
* &lt;/xs:restriction>
* &lt;/xs:simpleType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:simpleType name="Coin"&gt;
* &lt;xs:restriction base="xs:int"&gt;
* &lt;xs:enumeration value="1"/&gt;
* &lt;xs:enumeration value="5"/&gt;
* &lt;xs:enumeration value="10"/&gt;
* &lt;xs:enumeration value="25"/&gt;
* &lt;/xs:restriction&gt;
* &lt;/xs:simpleType&gt;
* </pre>
*
* <p><b>Example 3: </b>Map enum constant name -> enumeration facet </p>
* <p><b>Example 3: </b>Map enum constant name -&gt; enumeration facet </p>
*
* <pre>
* //Code fragment
@ -105,13 +105,13 @@ import static java.lang.annotation.ElementType.FIELD;
* &#64;XmlEnumValue("2") TWO;
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:simpleType name="Code">
* &lt;xs:restriction base="xs:int">
* &lt;xs:enumeration value="1"/>
* &lt;xs:enumeration value="2"/>
* &lt;/xs:restriction>
* &lt;/xs:simpleType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:simpleType name="Code"&gt;
* &lt;xs:restriction base="xs:int"&gt;
* &lt;xs:enumeration value="1"/&gt;
* &lt;xs:enumeration value="2"/&gt;
* &lt;/xs:restriction&gt;
* &lt;/xs:simpleType&gt;
* </pre>
*
* @since 1.6, JAXB 2.0

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -74,15 +74,15 @@ import static java.lang.annotation.RetentionPolicy.*;
* .... other properties not shown
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="Customer">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="Customer"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* ....
* &lt;/xs:sequence>
* &lt;xs:attribute name="customerID" type="xs:ID"/>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;xs:attribute name="customerID" type="xs:ID"/&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* @author Sekhar Vajjhala, Sun Microsystems, Inc.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -83,15 +83,15 @@ import static java.lang.annotation.RetentionPolicy.*;
* ....
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="Shipping">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;xs:element name="customer" type="xs:IDREF"/>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="Shipping"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="customer" type="xs:IDREF"/&gt;
* ....
* &lt;/xs:sequence>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
*
@ -143,61 +143,61 @@ import static java.lang.annotation.RetentionPolicy.*;
* public Invoice getInvoice();
* }
*
* &lt;!-- XML Schema mapping for above code frament -->
* &lt;!-- XML Schema mapping for above code frament --&gt;
*
* &lt;xs:complexType name="Invoice">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;xs:element name="customer" type="xs:IDREF"/>
* &lt;xs:complexType name="Invoice"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="customer" type="xs:IDREF"/&gt;
* ....
* &lt;/xs:sequence>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
*
* &lt;xs:complexType name="Shipping">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;xs:element name="customer" type="xs:IDREF"/>
* &lt;xs:complexType name="Shipping"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="customer" type="xs:IDREF"/&gt;
* ....
* &lt;/xs:sequence>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
*
* &lt;xs:complexType name="Customer">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;xs:complexType name="Customer"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* ....
* &lt;/xs:sequence>
* &lt;xs:attribute name="CustomerID" type="xs:ID"/>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;xs:attribute name="CustomerID" type="xs:ID"/&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
*
* &lt;xs:complexType name="CustomerData">
* &lt;xs:complexContent>
* &lt;xs:sequence>
* &lt;xs:element name="customer" type="xs:Customer"/>
* &lt;xs:element name="shipping" type="xs:Shipping"/>
* &lt;xs:element name="invoice" type="xs:Invoice"/>
* &lt;/xs:sequence>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;xs:complexType name="CustomerData"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="customer" type="xs:Customer"/&gt;
* &lt;xs:element name="shipping" type="xs:Shipping"/&gt;
* &lt;xs:element name="invoice" type="xs:Invoice"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
*
* &lt;xs:element name"customerData" type="xs:CustomerData"/>
* &lt;xs:element name"customerData" type="xs:CustomerData"/&gt;
*
* &lt;!-- Instance document conforming to the above XML Schema -->
* &lt;customerData>
* &lt;customer customerID="Alice">
* &lt;!-- Instance document conforming to the above XML Schema --&gt;
* &lt;customerData&gt;
* &lt;customer customerID="Alice"&gt;
* ....
* &lt;/customer>
* &lt;/customer&gt;
*
* &lt;shipping customer="Alice">
* &lt;shipping customer="Alice"&gt;
* ....
* &lt;/shipping>
* &lt;/shipping&gt;
*
* &lt;invoice customer="Alice">
* &lt;invoice customer="Alice"&gt;
* ....
* &lt;/invoice>
* &lt;/customerData>
* &lt;/invoice&gt;
* &lt;/customerData&gt;
*
* </pre>
*
@ -210,14 +210,14 @@ import static java.lang.annotation.RetentionPolicy.*;
* public List customers;
* }
*
* &lt;!-- XML schema fragment -->
* &lt;xs:complexType name="Shipping">
* &lt;xs:sequence>
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded">
* &lt;xs:element name="Alice" type="xs:IDREF"/>
* &lt;/xs:choice>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML schema fragment --&gt;
* &lt;xs:complexType name="Shipping"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded"&gt;
* &lt;xs:element name="Alice" type="xs:IDREF"/&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p><b>Example 4: </b> Mapping a List to a list of elements of type IDREF.
@ -231,15 +231,15 @@ import static java.lang.annotation.RetentionPolicy.*;
* public List customers;
* }
*
* &lt;!-- XML Schema fragment -->
* &lt;xs:complexType name="Shipping">
* &lt;xs:sequence>
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded">
* &lt;xs:element name="Alice" type="xs:IDREF"/>
* &lt;xs:element name="John" type="xs:IDREF"/>
* &lt;/xs:choice>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema fragment --&gt;
* &lt;xs:complexType name="Shipping"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:choice minOccurs="0" maxOccurs="unbounded"&gt;
* &lt;xs:element name="Alice" type="xs:IDREF"/&gt;
* &lt;xs:element name="John" type="xs:IDREF"/&gt;
* &lt;/xs:choice&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
* @author Sekhar Vajjhala, Sun Microsystems, Inc.
* @see XmlID

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -53,17 +53,17 @@ import static java.lang.annotation.ElementType.PARAMETER;
* &#64;XmlRootElement
* class Foo {
* &#64;XmlElement
* List&lt;String> data;
* List&lt;String&gt; data;
* }
* </pre>
*
* would produce XML like this:
*
* <pre>
* &lt;foo>
* &lt;data>abc</data>
* &lt;data>def</data>
* &lt;/foo>
* &lt;foo&gt;
* &lt;data&gt;abc&lt;/data&gt;
* &lt;data&gt;def&lt;/data&gt;
* &lt;/foo&gt;
* </pre>
*
* &#64;XmlList annotation, on the other hand, allows multiple values to be
@ -74,16 +74,16 @@ import static java.lang.annotation.ElementType.PARAMETER;
* class Foo {
* &#64;XmlElement
* &#64;XmlList
* List&lt;String> data;
* List&lt;String&gt; data;
* }
* </pre>
*
* the above code will produce XML like this:
*
* <pre>
* &lt;foo>
* &lt;data>abc def</data>
* &lt;/foo>
* &lt;foo&gt;
* &lt;data&gt;abc def&lt;/data&gt;
* &lt;/foo&gt;
* </pre>
*
* <p>This annotation can be used with the following annotations:

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -57,16 +57,16 @@ import javax.xml.bind.JAXBElement;
*
* Below is an example of binding and creation of mixed content.
* <pre>
* &lt;!-- schema fragment having mixed content -->
* &lt;xs:complexType name="letterBody" mixed="true">
* &lt;xs:sequence>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;xs:element name="quantity" type="xs:positiveInteger"/>
* &lt;xs:element name="productName" type="xs:string"/>
* &lt;!-- etc. -->
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;xs:element name="letterBody" type="letterBody"/>
* &lt;!-- schema fragment having mixed content --&gt;
* &lt;xs:complexType name="letterBody" mixed="true"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;xs:element name="quantity" type="xs:positiveInteger"/&gt;
* &lt;xs:element name="productName" type="xs:string"/&gt;
* &lt;!-- etc. --&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* &lt;xs:element name="letterBody" type="letterBody"/&gt;
*
* // Schema-derived Java code:
* // (Only annotations relevant to mixed content are shown below,
@ -74,12 +74,12 @@ import javax.xml.bind.JAXBElement;
* import java.math.BigInteger;
* public class ObjectFactory {
* // element instance factories
* JAXBElement&lt;LetterBody> createLetterBody(LetterBody value);
* JAXBElement&lt;String> createLetterBodyName(String value);
* JAXBElement&lt;BigInteger> createLetterBodyQuantity(BigInteger value);
* JAXBElement&lt;String> createLetterBodyProductName(String value);
* JAXBElement&lt;LetterBody&gt; createLetterBody(LetterBody value);
* JAXBElement&lt;String&gt; createLetterBodyName(String value);
* JAXBElement&lt;BigInteger&gt; createLetterBodyQuantity(BigInteger value);
* JAXBElement&lt;String&gt; createLetterBodyProductName(String value);
* // type instance factory
* LetterBody> createLetterBody();
* LetterBody createLetterBody();
* }
* </pre>
* <pre>
@ -97,16 +97,16 @@ import javax.xml.bind.JAXBElement;
* </pre>
* The following is an XML instance document with mixed content
* <pre>
* &lt;letterBody>
* Dear Mr.&lt;name>Robert Smith&lt;/name>
* Your order of &lt;quantity>1&lt;/quantity> &lt;productName>Baby
* Monitor&lt;/productName> shipped from our warehouse. ....
* &lt;/letterBody>
* &lt;letterBody&gt;
* Dear Mr.&lt;name&gt;Robert Smith&lt;/name&gt;
* Your order of &lt;quantity&gt;1&lt;/quantity&gt; &lt;productName&gt;Baby
* Monitor&lt;/productName&gt; shipped from our warehouse. ....
* &lt;/letterBody&gt;
* </pre>
* that can be constructed using following JAXB API calls.
* <pre>
* LetterBody lb = ObjectFactory.createLetterBody();
* JAXBElement&lt;LetterBody> lbe = ObjectFactory.createLetterBody(lb);
* JAXBElement&lt;LetterBody&gt; lbe = ObjectFactory.createLetterBody(lb);
* List gcl = lb.getContent(); //add mixed content to general content property.
* gcl.add("Dear Mr."); // add text information item as a String.
*

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -36,8 +36,7 @@ package javax.xml.bind.annotation;
* The namespace qualification values are used in the annotations
* defined in this packge. The enumeration values are mapped as follows:
*
* <p>
* <table border="1" cellpadding="4" cellspacing="3">
* <table summary="" border="1" cellpadding="4" cellspacing="3">
* <tbody>
* <tr>
* <td><b>Enum Value</b></td>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -54,7 +54,7 @@ import static java.lang.annotation.ElementType.TYPE;
* <p> This annotation can be used with the following annotations:
* {@link XmlType}, {@link XmlEnum}, {@link XmlAccessorType},
* {@link XmlAccessorOrder}.
* <p>
* </p>
* <p>
* <b>Example 1: </b> Associate an element with XML Schema type
@ -74,11 +74,11 @@ import static java.lang.annotation.ElementType.TYPE;
* </pre>
*
* <pre>
* &lt;!-- Example: XML output -->
* &lt;point>
* &lt;x> 3 </x>
* &lt;y> 5 </y>
* &lt;/point>
* &lt;!-- Example: XML output --&gt;
* &lt;point&gt;
* &lt;x&gt; 3 &lt;/x&gt;
* &lt;y&gt; 5 &lt;/y&gt;
* &lt;/point&gt;
* </pre>
*
* The annotation causes an global element declaration to be produced
@ -86,14 +86,14 @@ import static java.lang.annotation.ElementType.TYPE;
* the XML schema type to which the class is mapped.
*
* <pre>
* &lt;!-- Example: XML schema definition -->
* &lt;xs:element name="point" type="point"/>
* &lt;xs:complexType name="point">
* &lt;xs:sequence>
* &lt;xs:element name="x" type="xs:int"/>
* &lt;xs:element name="y" type="xs:int"/>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: XML schema definition --&gt;
* &lt;xs:element name="point" type="point"/&gt;
* &lt;xs:complexType name="point"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="x" type="xs:int"/&gt;
* &lt;xs:element name="y" type="xs:int"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p>
@ -114,25 +114,25 @@ import static java.lang.annotation.ElementType.TYPE;
* //Example: Code fragment corresponding to XML output *
* marshal( new Point3D(3,5,0), System.out );
*
* &lt;!-- Example: XML output -->
* &lt;!-- The element name is point3D not point -->
* &lt;point3D>
* &lt;x>3&lt;/x>
* &lt;y>5&lt;/y>
* &lt;z>0&lt;/z>
* &lt;/point3D>
* &lt;!-- Example: XML output --&gt;
* &lt;!-- The element name is point3D not point --&gt;
* &lt;point3D&gt;
* &lt;x&gt;3&lt;/x&gt;
* &lt;y&gt;5&lt;/y&gt;
* &lt;z&gt;0&lt;/z&gt;
* &lt;/point3D&gt;
*
* &lt;!-- Example: XML schema definition -->
* &lt;xs:element name="point3D" type="point3D"/>
* &lt;xs:complexType name="point3D">
* &lt;xs:complexContent>
* &lt;xs:extension base="point">
* &lt;xs:sequence>
* &lt;xs:element name="z" type="xs:int"/>
* &lt;/xs:sequence>
* &lt;/xs:extension>
* &lt;/xs:complexContent>
* &lt;/xs:complexType>
* &lt;!-- Example: XML schema definition --&gt;
* &lt;xs:element name="point3D" type="point3D"/&gt;
* &lt;xs:complexType name="point3D"&gt;
* &lt;xs:complexContent&gt;
* &lt;xs:extension base="point"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="z" type="xs:int"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:extension&gt;
* &lt;/xs:complexContent&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <b>Example 3: </b> Associate a global element with XML Schema type
@ -145,13 +145,13 @@ import static java.lang.annotation.ElementType.TYPE;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example: XML schema definition -->
* &lt;xs:element name="PriceElement" type="USPrice"/>
* &lt;xs:complexType name="USPrice">
* &lt;xs:sequence>
* &lt;xs:element name="price" type="xs:decimal"/>
* &lt;/sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: XML schema definition --&gt;
* &lt;xs:element name="PriceElement" type="USPrice"/&gt;
* &lt;xs:complexType name="USPrice"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="price" type="xs:decimal"/&gt;
* &lt;/sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* @author Sekhar Vajjhala, Sun Microsystems, Inc.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -55,7 +55,6 @@ import static java.lang.annotation.RetentionPolicy.*;
* will allow the package level annotations to be defined in
* package-info.java.
* </ul>
* <p>
*
* <p><b>Example 1:</b> Customize name of XML namespace to which
* package is mapped.</p>
@ -65,14 +64,14 @@ import static java.lang.annotation.RetentionPolicy.*;
* namespace = "http://www.example.com/MYPO1"
* )
*
* &lt;!-- XML Schema fragment -->
* &lt;!-- XML Schema fragment --&gt;
* &lt;schema
* xmlns=...
* xmlns:po=....
* targetNamespace="http://www.example.com/MYPO1"
* >
* &gt;
* &lt;!-- prefixes generated by default are implementation
* depedenent -->
* depedenent --&gt;
* </pre>
*
* <p><b>Example 2:</b> Customize namespace prefix, namespace URI
@ -90,11 +89,11 @@ import static java.lang.annotation.RetentionPolicy.*;
* )
* )
*
* &lt;!-- XML Schema fragment -->
* &lt;!-- XML Schema fragment --&gt;
* &lt;schema
* xmlns:xs="http://www.w3.org/2001/XMLSchema"
* xmlns:po="http://www.example.com/PO1"
* targetNamespace="http://www.example.com/PO1">
* targetNamespace="http://www.example.com/PO1"&gt;
*
* </pre>
*
@ -105,11 +104,11 @@ import static java.lang.annotation.RetentionPolicy.*;
* ...
* )
*
* &lt;!-- XML Schema fragment -->
* &lt;!-- XML Schema fragment --&gt;
* &lt;schema
* xmlns="http://www.w3.org/2001/XMLSchema"
* xmlns:po="http://www.example.com/PO1"
* elementFormDefault="unqualified">
* elementFormDefault="unqualified"&gt;
*
* </pre>
@ -180,11 +179,11 @@ public @interface XmlSchema {
* More precisely, the value must be either <tt>""</tt>, <tt>"##generate"</tt>, or
* <a href="http://www.w3.org/TR/xmlschema-2/#anyURI">
* a valid lexical representation of <tt>xs:anyURI</tt></a> that begins
* with <tt>&lt;scheme>:</tt>.
* with <tt>&lt;scheme&gt;:</tt>.
*
* <p>
* A schema generator is expected to generate a corresponding
* <tt>&lt;xs:import namespace="..." schemaLocation="..."/></tt> (or
* <tt>&lt;xs:import namespace="..." schemaLocation="..."/&gt;</tt> (or
* no <tt>schemaLocation</tt> attribute at all if the empty string is specified.)
* However, the schema generator is allowed to use a different value in
* the <tt>schemaLocation</tt> attribute (including not generating

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -66,12 +66,12 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* public XMLGregorianCalendar date;
* }
*
* &lt;!-- Example: Local XML Schema element -->
* &lt;xs:complexType name="USPrice"/>
* &lt;xs:sequence>
* &lt;xs:element name="date" type="xs:date"/>
* &lt;/sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: Local XML Schema element --&gt;
* &lt;xs:complexType name="USPrice"/&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="date" type="xs:date"/&gt;
* &lt;/sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p> <b> Example 2: </b> Customize mapping of XMLGregorianCalendar at package

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -79,12 +79,12 @@ import static java.lang.annotation.RetentionPolicy.*;
* }
*
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="USAddress">
* &lt;xs:sequence>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="USAddress"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* @author Sekhar Vajjhala, Sun Microsystems, Inc.

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -64,7 +64,7 @@ import java.lang.annotation.Target;
* mapping of JavaBean properties and fields contained within the
* class. The schema type to which the class is mapped can either be
* named or anonymous. A class can be mapped to an anonymous schema
* type by annotating the class with <tt>&#64XmlType(name="")</tt>.
* type by annotating the class with <tt>&#64;XmlType(name="")</tt>.
* <p>
* Either a global element, local element or a local attribute can be
* associated with an anonymous type as follows:
@ -112,14 +112,14 @@ import java.lang.annotation.Target;
* The following table shows the mapping of the class to a XML Schema
* complex type or simple type. The notational symbols used in the table are:
* <ul>
* <li> -> : represents a mapping </li>
* <li> -&gt; : represents a mapping </li>
* <li> [x]+ : one or more occurances of x </li>
* <li> [ <tt>@XmlValue</tt> property ]: JavaBean property annotated with
* <tt>@XmlValue</tt></li>
* <li> X : don't care
* </ul>
* <blockquote>
* <table border="1" cellpadding="4" cellspacing="3">
* <table summary="" border="1" cellpadding="4" cellspacing="3">
* <tbody>
* <tr>
* <td><b>Target</b></td>
@ -132,7 +132,7 @@ import java.lang.annotation.Target;
* <tr valign="top">
* <td>Class</td>
* <td>{}</td>
* <td>[property]+ -> elements</td>
* <td>[property]+ -&gt; elements</td>
* <td>complexcontent<br>xs:all</td>
* <td> </td>
* </tr>
@ -140,7 +140,7 @@ import java.lang.annotation.Target;
* <tr valign="top">
* <td>Class</td>
* <td>non empty</td>
* <td>[property]+ -> elements</td>
* <td>[property]+ -&gt; elements</td>
* <td>complexcontent<br>xs:sequence</td>
* <td> </td>
* </tr>
@ -148,7 +148,7 @@ import java.lang.annotation.Target;
* <tr valign="top">
* <td>Class</td>
* <td>X</td>
* <td>no property -> element</td>
* <td>no property -&gt; element</td>
* <td>complexcontent<br>empty sequence</td>
* <td> </td>
* </tr>
@ -156,8 +156,7 @@ import java.lang.annotation.Target;
* <tr valign="top">
* <td>Class</td>
* <td>X</td>
* <td>1 [ <tt>@XmlValue</tt> property] && <br> [property]+
* ->attributes</td>
* <td>1 [<tt>@XmlValue</tt> property] {@literal &&} <br> [property]+ -&gt; attributes</td>
* <td>simplecontent</td>
* <td> </td>
* </tr>
@ -165,11 +164,9 @@ import java.lang.annotation.Target;
* <tr valign="top">
* <td>Class</td>
* <td>X</td>
* <td>1 [ <tt>@XmlValue</tt> property ]&& <br> no properties
* -> attribute</td>
* <td>1 [<tt>@XmlValue</tt> property] {@literal &&} <br> no properties -&gt; attribute</td>
* <td> </td>
* <td>simpletype</td>
* <td> </td>
* </tr>
* </tbody>
* </table>
@ -212,16 +209,16 @@ import java.lang.annotation.Target;
* void setZip(java.math.BigDecimal) {..};
* }
*
* &lt;!-- XML Schema mapping for USAddress -->
* &lt;xs:complexType name="USAddress">
* &lt;xs:sequence>
* &lt;xs:element name="street" type="xs:string"/>
* &lt;xs:element name="city" type="xs:string"/>
* &lt;xs:element name="state" type="xs:string"/>
* &lt;xs:element name="zip" type="xs:decimal"/>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;/xs:all>
* &lt;/xs:complexType>
* &lt;!-- XML Schema mapping for USAddress --&gt;
* &lt;xs:complexType name="USAddress"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="street" type="xs:string"/&gt;
* &lt;xs:element name="city" type="xs:string"/&gt;
* &lt;xs:element name="state" type="xs:string"/&gt;
* &lt;xs:element name="zip" type="xs:decimal"/&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;/xs:all&gt;
* &lt;/xs:complexType&gt;
* </pre>
* <p> <b> Example 2: </b> Map a class to a complex type with
* xs:all </p>
@ -229,16 +226,16 @@ import java.lang.annotation.Target;
* &#64;XmlType(propOrder={})
* public class USAddress { ...}
*
* &lt;!-- XML Schema mapping for USAddress -->
* &lt;xs:complexType name="USAddress">
* &lt;xs:all>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;xs:element name="street" type="xs:string"/>
* &lt;xs:element name="city" type="xs:string"/>
* &lt;xs:element name="state" type="xs:string"/>
* &lt;xs:element name="zip" type="xs:decimal"/>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- XML Schema mapping for USAddress --&gt;
* &lt;xs:complexType name="USAddress"&gt;
* &lt;xs:all&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;xs:element name="street" type="xs:string"/&gt;
* &lt;xs:element name="city" type="xs:string"/&gt;
* &lt;xs:element name="state" type="xs:string"/&gt;
* &lt;xs:element name="zip" type="xs:decimal"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
*</pre>
* <p> <b> Example 3: </b> Map a class to a global element with an
* anonymous type.
@ -248,22 +245,22 @@ import java.lang.annotation.Target;
* &#64;XmlType(name="")
* public class USAddress { ...}
*
* &lt;!-- XML Schema mapping for USAddress -->
* &lt;xs:element name="USAddress">
* &lt;xs:complexType>
* &lt;xs:sequence>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;xs:element name="street" type="xs:string"/>
* &lt;xs:element name="city" type="xs:string"/>
* &lt;xs:element name="state" type="xs:string"/>
* &lt;xs:element name="zip" type="xs:decimal"/>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;/xs:element>
* &lt;!-- XML Schema mapping for USAddress --&gt;
* &lt;xs:element name="USAddress"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;xs:element name="street" type="xs:string"/&gt;
* &lt;xs:element name="city" type="xs:string"/&gt;
* &lt;xs:element name="state" type="xs:string"/&gt;
* &lt;xs:element name="zip" type="xs:decimal"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* &lt;/xs:element&gt;
* </pre>
*
* <p> <b> Example 4: </b> Map a property to a local element with
* anonmyous type.
* anonymous type.
* <pre>
* //Example: Code fragment
* public class Invoice {
@ -275,20 +272,20 @@ import java.lang.annotation.Target;
* public class USAddress { ... }
* }
*
* &lt;!-- XML Schema mapping for USAddress -->
* &lt;xs:complexType name="Invoice">
* &lt;xs:sequence>
* &lt;xs:element name="addr">
* &lt;xs:complexType>
* &lt;xs:element name="name", type="xs:string"/>
* &lt;xs:element name="city", type="xs:string"/>
* &lt;xs:element name="city" type="xs:string"/>
* &lt;xs:element name="state" type="xs:string"/>
* &lt;xs:element name="zip" type="xs:decimal"/>
* &lt;/xs:complexType>
* &lt;!-- XML Schema mapping for USAddress --&gt;
* &lt;xs:complexType name="Invoice"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="addr"&gt;
* &lt;xs:complexType&gt;
* &lt;xs:element name="name", type="xs:string"/&gt;
* &lt;xs:element name="city", type="xs:string"/&gt;
* &lt;xs:element name="city" type="xs:string"/&gt;
* &lt;xs:element name="state" type="xs:string"/&gt;
* &lt;xs:element name="zip" type="xs:decimal"/&gt;
* &lt;/xs:complexType&gt;
* ...
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p> <b> Example 5: </b> Map a property to an attribute with
@ -310,17 +307,17 @@ import java.lang.annotation.Target;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example: XML Schema fragment -->
* &lt;xs:complexType name="Item">
* &lt;xs:sequence>
* &lt;xs:element name="name" type="xs:string"/>
* &lt;xs:attribute name="price">
* &lt;xs:simpleType>
* &lt;xs:restriction base="xs:decimal"/>
* &lt;/xs:simpleType>
* &lt;/xs:attribute>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;!-- Example: XML Schema fragment --&gt;
* &lt;xs:complexType name="Item"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="name" type="xs:string"/&gt;
* &lt;xs:attribute name="price"&gt;
* &lt;xs:simpleType&gt;
* &lt;xs:restriction base="xs:decimal"/&gt;
* &lt;/xs:simpleType&gt;
* &lt;/xs:attribute&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* <p> <b> Example 6: </b> Define a factoryClass and factoryMethod

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -67,7 +67,6 @@ import static java.lang.annotation.RetentionPolicy.*;
* type, then the type must map to a XML Schema simple type. </li>
*
* </ul>
* </p>
* <p>
* If the annotated JavaBean property is the sole class member being
* mapped to XML Schema construct, then the class is mapped to a
@ -89,10 +88,10 @@ import static java.lang.annotation.RetentionPolicy.*;
* public java.math.BigDecimal price;
* }
*
* &lt;!-- Example 1: XML Schema fragment -->
* &lt;xs:simpleType name="USPrice">
* &lt;xs:restriction base="xs:decimal"/>
* &lt;/xs:simpleType>
* &lt;!-- Example 1: XML Schema fragment --&gt;
* &lt;xs:simpleType name="USPrice"&gt;
* &lt;xs:restriction base="xs:decimal"/&gt;
* &lt;/xs:simpleType&gt;
*
* </pre>
*
@ -110,17 +109,16 @@ import static java.lang.annotation.RetentionPolicy.*;
* public String currency;
* }
*
* &lt;!-- Example 2: XML Schema fragment -->
* &lt;xs:complexType name="InternationalPrice">
* &lt;xs:simpleContent>
* &lt;xs:extension base="xs:decimal">
* &lt;xs:attribute name="currency" type="xs:string"/>
* &lt;/xs:extension>
* &lt;/xs:simpleContent>
* &lt;/xs:complexType>
* &lt;!-- Example 2: XML Schema fragment --&gt;
* &lt;xs:complexType name="InternationalPrice"&gt;
* &lt;xs:simpleContent&gt;
* &lt;xs:extension base="xs:decimal"&gt;
* &lt;xs:attribute name="currency" type="xs:string"/&gt;
* &lt;/xs:extension&gt;
* &lt;/xs:simpleContent&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
* </p>
*
* @author Sekhar Vajjhala, Sun Microsystems, Inc.
* @see XmlType

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -76,11 +76,11 @@ package javax.xml.bind.annotation.adapters;
* <p> <b> Step 1: </b> Determine the desired XML representation for HashMap.
*
* <pre>
* &lt;hashmap>
* &lt;entry key="id123">this is a value&lt;/entry>
* &lt;entry key="id312">this is another value&lt;/entry>
* &lt;hashmap&gt;
* &lt;entry key="id123"&gt;this is a value&lt;/entry&gt;
* &lt;entry key="id312"&gt;this is another value&lt;/entry&gt;
* ...
* &lt;/hashmap>
* &lt;/hashmap&gt;
* </pre>
*
* <p> <b> Step 2: </b> Determine the schema definition that the
@ -88,20 +88,20 @@ package javax.xml.bind.annotation.adapters;
*
* <pre>
*
* &lt;xs:complexType name="myHashMapType">
* &lt;xs:sequence>
* &lt;xs:complexType name="myHashMapType"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="entry" type="myHashMapEntryType"
* minOccurs = "0" maxOccurs="unbounded"/>
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* minOccurs = "0" maxOccurs="unbounded"/&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
*
* &lt;xs:complexType name="myHashMapEntryType">
* &lt;xs:simpleContent>
* &lt;xs:extension base="xs:string">
* &lt;xs:attribute name="key" type="xs:int"/>
* &lt;/xs:extension>
* &lt;/xs:simpleContent>
* &lt;/xs:complexType>
* &lt;xs:complexType name="myHashMapEntryType"&gt;
* &lt;xs:simpleContent&gt;
* &lt;xs:extension base="xs:string"&gt;
* &lt;xs:attribute name="key" type="xs:int"/&gt;
* &lt;/xs:extension&gt;
* &lt;/xs:simpleContent&gt;
* &lt;/xs:complexType&gt;
*
* </pre>
*
@ -110,7 +110,7 @@ package javax.xml.bind.annotation.adapters;
*
* <pre>
* public class MyHashMapType {
* List&lt;MyHashMapEntryType> entry;
* List&lt;MyHashMapEntryType&gt; entry;
* }
*
* public class MyHashMapEntryType {
@ -127,7 +127,7 @@ package javax.xml.bind.annotation.adapters;
*
* <pre>
* public final class MyHashMapAdapter extends
* XmlAdapter&lt;MyHashMapType,HashMap> { ... }
* XmlAdapter&lt;MyHashMapType,HashMap&gt; { ... }
*
* </pre>
*
@ -144,11 +144,11 @@ package javax.xml.bind.annotation.adapters;
* The above code fragment will map to the following schema:
*
* <pre>
* &lt;xs:complexType name="Foo">
* &lt;xs:sequence>
* &lt;xs:element name="hashmap" type="myHashMapType"
* &lt;/xs:sequence>
* &lt;/xs:complexType>
* &lt;xs:complexType name="Foo"&gt;
* &lt;xs:sequence&gt;
* &lt;xs:element name="hashmap" type="myHashMapType"&gt;
* &lt;/xs:sequence&gt;
* &lt;/xs:complexType&gt;
* </pre>
*
* @param <BoundType>

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 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
@ -70,7 +70,7 @@ public abstract class AttachmentUnmarshaller {
*
* <p>The returned <code>DataHandler</code> instance must be configured
* to meet the following required mapping constaint.
* <table border="2" rules="all" cellpadding="4">
* <table summary="" border="2" rules="all" cellpadding="4">
* <thead>
* <tr>
* <th align="center" colspan="2">
@ -100,7 +100,7 @@ public abstract class AttachmentUnmarshaller {
* </tr>
* </tbody>
* </table>
* Note that it is allowable to support additional mappings.</p>
* Note that it is allowable to support additional mappings.
*
* @param cid It is expected to be a valid lexical form of the XML Schema
* <code>xs:anyURI</code> datatype. If <code>{@link #isXOPPackage()}

@ -23,7 +23,7 @@
# questions.
#
build-id=2.2.11-b141124.1933
build-version=JAX-WS RI 2.2.11-b141124.1933
build-id=2.2.11-b150127.1410
build-version=JAX-WS RI 2.2.11-b150127.1410
major-version=2.2.11
svn-revision=312b19a2e0e312b55e1ea6f531bd595955cd581f
svn-revision=28121d09ed8ac02b76788709ccb4cdb66e03bbfa

@ -30,10 +30,10 @@ BASEDIR_DOESNT_EXIST = \
Non-existent directory: {0}
VERSION = \
schemagen 2.2.12-b141016.1821
schemagen 2.2.12-b150126.1924
FULLVERSION = \
schemagen full version "2.2.12-b141016.1821"
schemagen full version "2.2.12-b150126.1924"
USAGE = \
Usage: schemagen [-options ...] <java files> \n\

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Nicht erkanntes {0} in Zeile {1} Spalte {2}
BASEDIR_DOESNT_EXIST = Nicht vorhandenes Verzeichnis: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.12-b141016.1821"
FULLVERSION = schemagen vollst\u00E4ndige Version "2.2.12-b150126.1924"
USAGE = Verwendung: schemagen [-options ...] <java files> \nOptionen: \n\\ \\ \\ \\ -d <path> : Gibt an, wo die von Prozessor und javac generierten Klassendateien gespeichert werden sollen\n\\ \\ \\ \\ -cp <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -classpath <path> : Gibt an, wo die vom Benutzer angegebenen Dateien gespeichert sind\n\\ \\ \\ \\ -encoding <encoding> : Gibt die Codierung f\u00FCr die Annotationsverarbeitung/den javac-Aufruf an \n\\ \\ \\ \\ -episode <file> : Generiert Episodendatei f\u00FCr separate Kompilierung\n\\ \\ \\ \\ -version : Zeigt Versionsinformation an\n\\ \\ \\ \\ -fullversion : Zeigt vollst\u00E4ndige Versionsinformationen an\n\\ \\ \\ \\ -help : Zeigt diese Verwendungsmeldung an

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Aparece un {0} inesperado en la l\u00EDnea {1} y la colu
BASEDIR_DOESNT_EXIST = Directorio no existente: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = versi\u00F3n completa de schemagen "2.2.12-b141016.1821"
FULLVERSION = versi\u00F3n completa de schemagen "2.2.12-b150126.1924"
USAGE = Sintaxis: schemagen [-options ...] <archivos java> \nOpciones: \n\\ \\ \\ \\ -d <ruta de acceso> : especifique d\u00F3nde se colocan los archivos de clase generados por javac y el procesador\n\\ \\ \\ \\ -cp <ruta de acceso> : especifique d\u00F3nde se encuentran los archivos especificados por el usuario\n\\ \\ \\ \\ -encoding <codificaci\u00F3n> : especifique la codificaci\u00F3n que se va a utilizar para el procesamiento de anotaciones/llamada de javac\n\\ \\ \\ \\ -episode <archivo> : genera un archivo de episodio para una compilaci\u00F3n diferente\n\\ \\ \\ \\ -version : muestra la informaci\u00F3n de la versi\u00F3n\n\\ \\ \\ \\ -fullversion : muestra la informaci\u00F3n completa de la versi\u00F3n\n\\ \\ \\ \\ -help : muestra este mensaje de sintaxis

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = Un \u00E9l\u00E9ment {0} inattendu appara\u00EEt \u00E0
BASEDIR_DOESNT_EXIST = R\u00E9pertoire {0} inexistant
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = version compl\u00E8te de schemagen "2.2.12-b141016.1821"
FULLVERSION = version compl\u00E8te de schemagen "2.2.12-b150126.1924"
USAGE = Syntaxe : schemagen [-options ...] <java files> \nOptions : \n\ \ \ \ -d <path> : indiquez o\u00F9 placer les fichiers de classe g\u00E9n\u00E9r\u00E9s par le processeur et le compilateur javac\n\ \ \ \ -cp <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -classpath <path> : indiquez o\u00F9 trouver les fichiers sp\u00E9cifi\u00E9s par l'utilisateur\n\ \ \ \ -encoding <encoding> : indiquez l'encodage \u00E0 utiliser pour l'appel de javac/traitement de l'annotation \n\ \ \ \ -episode <file> : g\u00E9n\u00E9rez un fichier d'\u00E9pisode pour la compilation s\u00E9par\u00E9e\n\ \ \ \ -version : affichez les informations de version\n\ \ \ \ -fullversion : affichez les informations compl\u00E8tes de version\n\ \ \ \ -help : affichez ce message de syntaxe

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} imprevisto visualizzato sulla riga {1} colonna {2}
BASEDIR_DOESNT_EXIST = Directory non esistente: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = versione completa schemagen "2.2.12-b141016.1821"
FULLVERSION = versione completa schemagen "2.2.12-b150126.1924"
USAGE = Uso: schemagen [-options ...] <java files> \nOpzioni: \n\ \ \ \ -d <path> : specifica dove posizionare il processore e i file della classe generata javac\n\ \ \ \ -cp <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -classpath <path> : specifica dove trovare i file specificati dall'utente\n\ \ \ \ -encoding <encoding> : specifica la codifica da usare per l'elaborazione dell'annotazione/richiamo javac \n\ \ \ \ -episode <file> : genera il file di episodio per la compilazione separata\n\ \ \ \ -version : visualizza le informazioni sulla versione\n\ \ \ \ -fullversion : visualizza le informazioni sulla versione completa\n\ \ \ \ -help : visualizza questo messaggio sull'uso

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u4E88\u671F\u3057\u306A\u3044{0}\u304C\u884C{1}\u3001\u
BASEDIR_DOESNT_EXIST = \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b141016.1821"
FULLVERSION = schemagen\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b150126.1924"
USAGE = \u4F7F\u7528\u65B9\u6CD5: schemagen [-options ...] <java files> \n\u30AA\u30D7\u30B7\u30E7\u30F3: \n\ \ \ \ -d <path> : \u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -cp <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -classpath <path> : \u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -encoding <encoding> : \u6CE8\u91C8\u51E6\u7406/javac\u547C\u51FA\u3057\u306B\u4F7F\u7528\u3059\u308B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3092\u6307\u5B9A\u3057\u307E\u3059\n\ \ \ \ -episode <file> : \u30B3\u30F3\u30D1\u30A4\u30EB\u3054\u3068\u306B\u30A8\u30D4\u30BD\u30FC\u30C9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u751F\u6210\u3057\u307E\u3059\n\ \ \ \ -version : \u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -fullversion : \u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059\n\ \ \ \ -help : \u3053\u306E\u4F7F\u7528\u4F8B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u307E\u3059

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \uC608\uC0C1\uCE58 \uC54A\uC740 {0}\uC774(\uAC00) {1}\uD
BASEDIR_DOESNT_EXIST = \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uB514\uB809\uD1A0\uB9AC: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.12-b141016.1821"
FULLVERSION = schemagen \uC815\uC2DD \uBC84\uC804 "2.2.12-b150126.1924"
USAGE = \uC0AC\uC6A9\uBC95: schemagen [-options ...] <java files> \n\uC635\uC158: \n\ \ \ \ -d <path> : \uD504\uB85C\uC138\uC11C \uBC0F javac\uC5D0\uC11C \uC0DD\uC131\uD55C \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uBC30\uCE58\uD560 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -cp <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -classpath <path> : \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C \uD30C\uC77C\uC744 \uCC3E\uC744 \uC704\uCE58\uB97C \uC9C0\uC815\uD569\uB2C8\uB2E4.\n\ \ \ \ -encoding <encoding> : \uC8FC\uC11D \uCC98\uB9AC/javac \uD638\uCD9C\uC5D0 \uC0AC\uC6A9\uD560 \uC778\uCF54\uB529\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4. \n\ \ \ \ -episode <file> : \uBCC4\uB3C4 \uCEF4\uD30C\uC77C\uC744 \uC704\uD574 episode \uD30C\uC77C\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n\ \ \ \ -version : \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -fullversion : \uC815\uC2DD \uBC84\uC804 \uC815\uBCF4\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.\n\ \ \ \ -help : \uC774 \uC0AC\uC6A9\uBC95 \uBA54\uC2DC\uC9C0\uB97C \uD45C\uC2DC\uD569\uB2C8\uB2E4.

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = {0} inesperado aparece na linha {1} coluna {2}
BASEDIR_DOESNT_EXIST = Diret\u00F3rio n\u00E3o existente: {0}
VERSION = gera\u00E7\u00E3o do esquema 2.2.12-b141016.1821
VERSION = gera\u00E7\u00E3o do esquema 2.2.12-b150126.1924
FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.12-b141016.1821"
FULLVERSION = vers\u00E3o completa da gera\u00E7\u00E3o do esquema "2.2.12-b150126.1924"
USAGE = Uso: gera\u00E7\u00E3o do esquema [-options ...] <java files> \nOp\u00E7\u00F5es: \n\\ \\ \\ \\ -d <path> : especificar onde colocar o processador e os arquivos da classe gerados por javac\n\\ \\ \\ \\ -cp <path> : especificar onde localizar arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -classpath <path> : especificar onde localizar os arquivos especificados pelo usu\u00E1rio\n\\ \\ \\ \\ -encoding <encoding> : especificar codifica\u00E7\u00E3o a ser usada para processamento de anota\u00E7\u00E3o/chamada javac \n\\ \\ \\ \\ -episode <file> : gerar arquivo do epis\u00F3dio para compila\u00E7\u00E3o separada\n\\ \\ \\ \\ -version : exibir informa\u00E7\u00F5es da vers\u00E3o\n\\ \\ \\ \\ -fullversion : exibir informa\u00E7\u00F5es da vers\u00E3o completa\n\\ \\ \\ \\ -help : exibir esta mensagem de uso

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u5728\u7B2C {1} \u884C, \u7B2C {2} \u5217\u51FA\u73B0\u
BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u5F55: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821"
FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b150126.1924"
USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9009\u9879: \n\ \ \ \ -d <path> : \u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -cp <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -classpath <path> : \u6307\u5B9A\u67E5\u627E\u7528\u6237\u6307\u5B9A\u6587\u4EF6\u7684\u4F4D\u7F6E\n\ \ \ \ -encoding <encoding> : \u6307\u5B9A\u7528\u4E8E\u6CE8\u91CA\u5904\u7406/javac \u8C03\u7528\u7684\u7F16\u7801\n\ \ \ \ -episode <file> : \u751F\u6210\u7247\u6BB5\u6587\u4EF6\u4EE5\u4F9B\u5355\u72EC\u7F16\u8BD1\n\ \ \ \ -version : \u663E\u793A\u7248\u672C\u4FE1\u606F\n\ \ \ \ -fullversion : \u663E\u793A\u5B8C\u6574\u7684\u7248\u672C\u4FE1\u606F\n\ \ \ \ -help : \u663E\u793A\u6B64\u7528\u6CD5\u6D88\u606F

@ -27,8 +27,8 @@ UNEXPECTED_NGCC_TOKEN = \u672A\u9810\u671F\u7684 {0} \u986F\u793A\u65BC\u884C {1
BASEDIR_DOESNT_EXIST = \u4E0D\u5B58\u5728\u7684\u76EE\u9304: {0}
VERSION = schemagen 2.2.12-b141016.1821
VERSION = schemagen 2.2.12-b150126.1924
FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821"
FULLVERSION = schemagen \u5B8C\u6574\u7248\u672C "2.2.12-b150126.1924"
USAGE = \u7528\u6CD5: schemagen [-options ...] <java files> \n\u9078\u9805: \n\\ \\ \\ \\ -d <path> : \u6307\u5B9A\u8655\u7406\u5668\u4EE5\u53CA javac \u7522\u751F\u7684\u985E\u5225\u6A94\u6848\u653E\u7F6E\u4F4D\u7F6E\n\\ \\ \\ \\ -cp <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -classpath <path> : \u6307\u5B9A\u8981\u5C0B\u627E\u4F7F\u7528\u8005\u6307\u5B9A\u6A94\u6848\u7684\u4F4D\u7F6E\n\\ \\ \\ \\ -encoding <encoding> : \u6307\u5B9A\u8981\u7528\u65BC\u8A3B\u89E3\u8655\u7406/javac \u547C\u53EB\u7684\u7DE8\u78BC \n\\ \\ \\ \\ -episode <file> : \u7522\u751F\u7368\u7ACB\u7DE8\u8B6F\u7684\u4E8B\u4EF6 (episode) \u6A94\u6848\n\\ \\ \\ \\ -version : \u986F\u793A\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -fullversion : \u986F\u793A\u5B8C\u6574\u7248\u672C\u8CC7\u8A0A\n\\ \\ \\ \\ -help : \u986F\u793A\u6B64\u7528\u6CD5\u8A0A\u606F

@ -171,20 +171,20 @@ Driver.CompilingSchema = \
Driver.FailedToGenerateCode = \
Failed to produce code.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 \n\
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150126.1924 \n\
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\
Any modifications to this file will be lost upon recompilation of the source schema. \n\
Generated on: {0} \n
Driver.Version = \
xjc 2.2.12-b141016.1821
xjc 2.2.12-b150126.1924
Driver.FullVersion = \
xjc full version "2.2.12-b141016.1821"
xjc full version "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = Ein Schema wird kompiliert ...
Driver.FailedToGenerateCode = Code konnte nicht erzeugt werden.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Diese Datei wurde mit der JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150126.1924 generiert \nSiehe <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u00c4nderungen an dieser Datei gehen bei einer Neukompilierung des Quellschemas verloren. \nGeneriert: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.12-b141016.1821"
Driver.FullVersion = xjc vollst\u00E4ndige Version "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = Compilando un esquema...
Driver.FailedToGenerateCode = Fallo al producir c\u00f3digo.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.12-b141016.1821 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Este archivo ha sido generado por la arquitectura JavaTM para la implantaci\u00f3n de la referencia de enlace (JAXB) XML v2.2.12-b150126.1924 \nVisite <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas las modificaciones realizadas en este archivo se perder\u00e1n si se vuelve a compilar el esquema de origen. \nGenerado el: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = versi\u00F3n completa de xjc "2.2.12-b141016.1821"
Driver.FullVersion = versi\u00F3n completa de xjc "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = compilation d'un sch\u00e9ma...
Driver.FailedToGenerateCode = Echec de la production du code.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.12-b141016.1821 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Ce fichier a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 par l''impl\u00e9mentation de r\u00e9f\u00e9rence JavaTM Architecture for XML Binding (JAXB), v2.2.12-b150126.1924 \nVoir <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nToute modification apport\u00e9e \u00e0 ce fichier sera perdue lors de la recompilation du sch\u00e9ma source. \nG\u00e9n\u00e9r\u00e9 le : {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = version compl\u00E8te xjc "2.2.12-b141016.1821"
Driver.FullVersion = version compl\u00E8te xjc "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = compilazione di uno schema in corso...
Driver.FailedToGenerateCode = Produzione del codice non riuscita.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.12-b141016.1821 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Questo file \u00e8 stato generato dall''architettura JavaTM per XML Binding (JAXB) Reference Implementation, v2.2.12-b150126.1924 \nVedere <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nQualsiasi modifica a questo file andr\u00e0 persa durante la ricompilazione dello schema di origine. \nGenerato il: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = versione completa xjc "2.2.12-b141016.1821"
Driver.FullVersion = versione completa xjc "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = \u30b9\u30ad\u30fc\u30de\u306e\u30b3\u30f3\u30d1\u30a4\
Driver.FailedToGenerateCode = \u30b3\u30fc\u30c9\u306e\u751f\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.12-b141016.1821\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001JavaTM Architecture for XML Binding(JAXB) Reference Implementation\u3001v2.2.12-b150126.1924\u306b\u3088\u3063\u3066\u751f\u6210\u3055\u308c\u307e\u3057\u305f \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 \n\u30bd\u30fc\u30b9\u30fb\u30b9\u30ad\u30fc\u30de\u306e\u518d\u30b3\u30f3\u30d1\u30a4\u30eb\u6642\u306b\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306f\u5931\u308f\u308c\u307e\u3059\u3002 \n\u751f\u6210\u65e5: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b141016.1821"
Driver.FullVersion = xjc\u30D5\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3"2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = \uc2a4\ud0a4\ub9c8\ub97c \ucef4\ud30c\uc77c\ud558\ub294
Driver.FailedToGenerateCode = \ucf54\ub4dc \uc0dd\uc131\uc744 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.12-b141016.1821 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \uc774 \ud30c\uc77c\uc740 JAXB(JavaTM Architecture for XML Binding) \ucc38\uc870 \uad6c\ud604 2.2.12-b150126.1924 \ubc84\uc804\uc744 \ud1b5\ud574 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \n<a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624. \n\uc774 \ud30c\uc77c\uc744 \uc218\uc815\ud558\uba74 \uc18c\uc2a4 \uc2a4\ud0a4\ub9c8\ub97c \uc7ac\ucef4\ud30c\uc77c\ud560 \ub54c \uc218\uc815 \uc0ac\ud56d\uc774 \uc190\uc2e4\ub429\ub2c8\ub2e4. \n\uc0dd\uc131 \ub0a0\uc9dc: {0} \n
Driver.Version = XJC 2.2.12-b141016.1821
Driver.Version = XJC 2.2.12-b150126.1924
Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.12-b141016.1821"
Driver.FullVersion = XJC \uC815\uC2DD \uBC84\uC804 "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = compilando um esquema...
Driver.FailedToGenerateCode = Falha ao produzir o c\u00f3digo.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.12-b141016.1821 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = Este arquivo foi gerado pela Arquitetura JavaTM para Implementa\u00e7\u00e3o de Refer\u00eancia (JAXB) de Bind XML, v2.2.12-b150126.1924 \nConsulte <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \nTodas as modifica\u00e7\u00f5es neste arquivo ser\u00e3o perdidas ap\u00f3s a recompila\u00e7\u00e3o do esquema de origem. \nGerado em: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = vers\u00E3o completa de xjc "2.2.12-b141016.1821"
Driver.FullVersion = vers\u00E3o completa de xjc "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = \u6b63\u5728\u7f16\u8bd1\u6a21\u5f0f...
Driver.FailedToGenerateCode = \u65e0\u6cd5\u751f\u6210\u4ee3\u7801\u3002
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.12-b141016.1821 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u6b64\u6587\u4ef6\u662f\u7531 JavaTM Architecture for XML Binding (JAXB) \u5f15\u7528\u5b9e\u73b0 v2.2.12-b150126.1924 \u751f\u6210\u7684\n\u8bf7\u8bbf\u95ee <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u5728\u91cd\u65b0\u7f16\u8bd1\u6e90\u6a21\u5f0f\u65f6, \u5bf9\u6b64\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u90fd\u5c06\u4e22\u5931\u3002\n\u751f\u6210\u65f6\u95f4: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821"
Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -96,14 +96,14 @@ Driver.CompilingSchema = \u6b63\u5728\u7de8\u8b6f\u7db1\u8981...
Driver.FailedToGenerateCode = \u7121\u6cd5\u7522\u751f\u7a0b\u5f0f\u78bc.
# DO NOT localize the 2.2.12-b141016.1821 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b141016.1821 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
# DO NOT localize the 2.2.12-b150126.1924 string - it is a token for an mvn <properties filter>
Driver.FilePrologComment = \u6b64\u6a94\u6848\u662f\u7531 JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.12-b150126.1924 \u6240\u7522\u751f \n\u8acb\u53c3\u95b1 <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\u4e00\u65e6\u91cd\u65b0\u7de8\u8b6f\u4f86\u6e90\u7db1\u8981, \u5c0d\u6b64\u6a94\u6848\u6240\u505a\u7684\u4efb\u4f55\u4fee\u6539\u90fd\u5c07\u6703\u907a\u5931. \n\u7522\u751f\u6642\u9593: {0} \n
Driver.Version = xjc 2.2.12-b141016.1821
Driver.Version = xjc 2.2.12-b150126.1924
Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b141016.1821"
Driver.FullVersion = xjc \u5B8C\u6574\u7248\u672C "2.2.12-b150126.1924"
Driver.BuildID = 2.2.12-b141016.1821
Driver.BuildID = 2.2.12-b150126.1924
# for JDK integration - include version in source zip
jaxb.jdk.version=@@JAXB_JDK_VERSION@@

@ -32,18 +32,18 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
import com.sun.codemodel.internal.CodeWriter;
@ -354,9 +354,7 @@ public class Options
*/
public List<Plugin> getAllPlugins() {
if(allPlugins==null) {
allPlugins = new ArrayList<Plugin>();
ClassLoader ucl = getUserClassLoader(SecureLoader.getClassClassLoader(getClass()));
allPlugins.addAll(Arrays.asList(findServices(Plugin.class,ucl)));
allPlugins = findServices(Plugin.class);
}
return allPlugins;
@ -924,118 +922,44 @@ public class Options
/**
* If a plugin failed to load, report.
*/
private static String pluginLoadFailure;
private String pluginLoadFailure;
/**
* Looks for all "META-INF/services/[className]" files and
* create one instance for each class name found inside this file.
*/
private static <T> T[] findServices( Class<T> clazz, ClassLoader classLoader ) {
// if true, print debug output
final boolean debug = com.sun.tools.internal.xjc.util.Util.getSystemProperty(Options.class,"findServices")!=null;
// if we are running on Mustang or Dolphin, use ServiceLoader
// so that we can take advantage of JSR-277 module system.
private <T> List<T> findServices( Class<T> clazz) {
final List<T> result = new ArrayList<T>();
final boolean debug = getDebugPropertyValue();
try {
Class<?> serviceLoader = Class.forName("java.util.ServiceLoader");
if(debug)
System.out.println("Using java.util.ServiceLoader");
Iterable<T> itr = (Iterable<T>)serviceLoader.getMethod("load",Class.class,ClassLoader.class).invoke(null,clazz,classLoader);
List<T> r = new ArrayList<T>();
for (T t : itr)
r.add(t);
return r.toArray((T[])Array.newInstance(clazz,r.size()));
} catch (ClassNotFoundException e) {
// fall through
} catch (IllegalAccessException e) {
Error x = new IllegalAccessError();
x.initCause(e);
throw x;
} catch (InvocationTargetException e) {
Throwable x = e.getTargetException();
if (x instanceof RuntimeException)
throw (RuntimeException) x;
if (x instanceof Error)
throw (Error) x;
throw new Error(x);
} catch (NoSuchMethodException e) {
Error x = new NoSuchMethodError();
x.initCause(e);
throw x;
}
String serviceId = "META-INF/services/" + clazz.getName();
// used to avoid creating the same instance twice
Set<String> classNames = new HashSet<String>();
if(debug) {
System.out.println("Looking for "+serviceId+" for add-ons");
}
// try to find services in CLASSPATH
try {
Enumeration<URL> e = classLoader.getResources(serviceId);
if(e==null) return (T[])Array.newInstance(clazz,0);
ArrayList<T> a = new ArrayList<T>();
while(e.hasMoreElements()) {
URL url = e.nextElement();
BufferedReader reader=null;
if(debug) {
System.out.println("Checking "+url+" for an add-on");
}
try {
reader = new BufferedReader(new InputStreamReader(url.openStream()));
String impl;
while((impl = reader.readLine())!=null ) {
// try to instanciate the object
impl = impl.trim();
if(classNames.add(impl)) {
Class implClass = classLoader.loadClass(impl);
if(!clazz.isAssignableFrom(implClass)) {
pluginLoadFailure = impl+" is not a subclass of "+clazz+". Skipping";
if(debug)
System.out.println(pluginLoadFailure);
continue;
}
if(debug) {
System.out.println("Attempting to instanciate "+impl);
}
a.add(clazz.cast(implClass.newInstance()));
}
}
reader.close();
} catch( Exception ex ) {
// let it go.
StringWriter w = new StringWriter();
ex.printStackTrace(new PrintWriter(w));
pluginLoadFailure = w.toString();
if(debug) {
System.out.println(pluginLoadFailure);
}
if( reader!=null ) {
try {
reader.close();
} catch( IOException ex2 ) {
// ignore
}
}
}
}
return a.toArray((T[])Array.newInstance(clazz,a.size()));
// TCCL allows user plugins to be loaded even if xjc is in jdk
// We have to use our SecureLoader to obtain it because we are trying to avoid SecurityException
final ClassLoader tccl = SecureLoader.getContextClassLoader();
final ServiceLoader<T> sl = ServiceLoader.load(clazz, tccl);
for (T t : sl)
result.add(t);
} catch( Throwable e ) {
// ignore any error
StringWriter w = new StringWriter();
e.printStackTrace(new PrintWriter(w));
pluginLoadFailure = w.toString();
if(debug) {
if(debug)
System.out.println(pluginLoadFailure);
}
return (T[])Array.newInstance(clazz,0);
}
return result;
}
private static boolean getDebugPropertyValue() {
final String debugPropertyName = Options.class.getName() + ".findServices";
if (System.getSecurityManager() != null) {
return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
@Override
public Boolean run() {
return Boolean.getBoolean(debugPropertyName);
}
});
} else {
return Boolean.getBoolean(debugPropertyName);
}
}

@ -40,7 +40,7 @@ import com.sun.codemodel.internal.JForEach;
import com.sun.codemodel.internal.JType;
import com.sun.codemodel.internal.JVar;
import com.sun.tools.internal.xjc.model.CElementInfo;
import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED;
import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED;
import com.sun.tools.internal.xjc.outline.FieldAccessor;
import com.sun.tools.internal.xjc.outline.FieldOutline;

@ -33,7 +33,7 @@ import com.sun.codemodel.internal.JVar;
import com.sun.codemodel.internal.JConditional;
import com.sun.codemodel.internal.JExpr;
import com.sun.codemodel.internal.JExpression;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.FieldOutline;
import com.sun.tools.internal.xjc.outline.FieldAccessor;
import com.sun.tools.internal.xjc.model.CElementInfo;

@ -36,7 +36,7 @@ import com.sun.tools.internal.xjc.generator.annotation.spec.XmlJavaTypeAdapterWr
import com.sun.tools.internal.xjc.model.CAdapter;
import com.sun.tools.internal.xjc.model.TypeUse;
import com.sun.tools.internal.xjc.model.nav.NType;
import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED;
import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapterMarker;

@ -25,7 +25,7 @@
package com.sun.tools.internal.xjc.generator.bean;
import static com.sun.tools.internal.xjc.model.Aspect.EXPOSED;
import static com.sun.tools.internal.xjc.outline.Aspect.EXPOSED;
import java.io.Serializable;
import java.net.URL;
@ -90,7 +90,7 @@ import com.sun.tools.internal.xjc.model.CPropertyInfo;
import com.sun.tools.internal.xjc.model.CTypeRef;
import com.sun.tools.internal.xjc.model.Model;
import com.sun.tools.internal.xjc.model.CClassRef;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.ClassOutline;
import com.sun.tools.internal.xjc.outline.EnumConstantOutline;
import com.sun.tools.internal.xjc.outline.EnumOutline;

@ -39,7 +39,7 @@ import com.sun.codemodel.internal.JMethod;
import com.sun.codemodel.internal.JMod;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.CElementInfo;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.ElementOutline;
/**

@ -42,7 +42,7 @@ import com.sun.codemodel.internal.JType;
import com.sun.codemodel.internal.JVar;
import com.sun.tools.internal.xjc.generator.annotation.spec.XmlAccessorTypeWriter;
import com.sun.tools.internal.xjc.model.CClassInfo;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -51,7 +51,7 @@ import com.sun.tools.internal.xjc.model.CElementInfo;
import com.sun.tools.internal.xjc.model.CPropertyInfo;
import com.sun.tools.internal.xjc.model.Constructor;
import com.sun.tools.internal.xjc.model.Model;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.FieldAccessor;
import com.sun.tools.internal.xjc.outline.FieldOutline;
import com.sun.xml.internal.bind.v2.TODO;

@ -49,7 +49,7 @@ import com.sun.tools.internal.xjc.model.CTypeRef;
import com.sun.tools.internal.xjc.model.CValuePropertyInfo;
import com.sun.tools.internal.xjc.model.Model;
import com.sun.tools.internal.xjc.outline.PackageOutline;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
/**
* {@link PackageOutline} enhanced with schema2java specific

@ -32,7 +32,7 @@ import com.sun.codemodel.internal.JPackage;
import com.sun.codemodel.internal.fmt.JPropertyFile;
import com.sun.tools.internal.xjc.model.CElementInfo;
import com.sun.tools.internal.xjc.model.Model;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.runtime.JAXBContextFactory;
/**

@ -28,7 +28,7 @@ package com.sun.tools.internal.xjc.generator.bean;
import com.sun.codemodel.internal.JPackage;
import com.sun.tools.internal.xjc.model.CElementInfo;
import com.sun.tools.internal.xjc.model.Model;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
/**
* Generates public ObjectFactory.

@ -63,8 +63,8 @@ import com.sun.tools.internal.xjc.model.CTypeInfo;
import com.sun.tools.internal.xjc.model.CTypeRef;
import com.sun.tools.internal.xjc.model.CValuePropertyInfo;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.Aspect;
import static com.sun.tools.internal.xjc.model.Aspect.IMPLEMENTATION;
import com.sun.tools.internal.xjc.outline.Aspect;
import static com.sun.tools.internal.xjc.outline.Aspect.IMPLEMENTATION;
import com.sun.tools.internal.xjc.outline.ClassOutline;
import com.sun.tools.internal.xjc.outline.FieldAccessor;
import com.sun.tools.internal.xjc.outline.FieldOutline;

@ -38,7 +38,7 @@ import com.sun.codemodel.internal.JVar;
import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
import com.sun.tools.internal.xjc.generator.bean.MethodWriter;
import com.sun.tools.internal.xjc.model.CPropertyInfo;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.xml.internal.bind.api.impl.NameConverter;
import java.io.Serializable;

@ -40,7 +40,7 @@ import com.sun.tools.internal.xjc.generator.bean.MethodWriter;
import com.sun.tools.internal.xjc.model.CElement;
import com.sun.tools.internal.xjc.model.CPropertyInfo;
import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.xml.internal.bind.api.impl.NameConverter;
import java.io.Serializable;
import java.util.Set;

@ -35,7 +35,7 @@ import com.sun.codemodel.internal.JVar;
import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
import com.sun.tools.internal.xjc.generator.bean.MethodWriter;
import com.sun.tools.internal.xjc.model.CPropertyInfo;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.FieldAccessor;
import com.sun.xml.internal.bind.api.impl.NameConverter;

@ -34,6 +34,7 @@ import com.sun.tools.internal.xjc.model.nav.EagerNClass;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.model.nav.NavigatorImpl;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.xml.internal.bind.v2.model.core.Adapter;

@ -28,6 +28,7 @@ package com.sun.tools.internal.xjc.model;
import javax.xml.namespace.QName;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.xml.internal.bind.v2.model.util.ArrayInfoUtil;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;

@ -49,6 +49,7 @@ import com.sun.codemodel.internal.JExpr;
import com.sun.codemodel.internal.JExpression;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
import com.sun.xml.internal.bind.v2.model.core.BuiltinLeafInfo;
import com.sun.xml.internal.bind.v2.model.core.Element;

@ -45,6 +45,7 @@ import com.sun.istack.internal.Nullable;
import com.sun.tools.internal.xjc.Language;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.tools.internal.xjc.reader.Ring;
import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;

@ -30,6 +30,7 @@ import javax.xml.namespace.QName;
import com.sun.codemodel.internal.JClass;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIClass;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIEnum;

@ -43,6 +43,7 @@ import static com.sun.tools.internal.xjc.model.CElementPropertyInfo.CollectionMo
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.model.nav.NavigatorImpl;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIInlineBinaryData;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIFactoryMethod;

@ -34,6 +34,7 @@ import com.sun.codemodel.internal.JClass;
import com.sun.codemodel.internal.JExpression;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
import com.sun.xml.internal.bind.v2.model.core.EnumLeafInfo;

@ -26,7 +26,7 @@
package com.sun.tools.internal.xjc.model;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.Map;
@ -60,7 +60,7 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
/**
* List of referenced elements.
*/
private final Set<CElement> elements = new HashSet<CElement>();
private final Set<CElement> elements = new LinkedHashSet<CElement>();
private final boolean isMixed;
private WildcardMode wildcard;
@ -87,7 +87,7 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
// so the Java types of the substitution members need to be taken into account
// when computing the signature
final class RefList extends HashSet<CTypeInfo> {
final class RefList extends LinkedHashSet<CTypeInfo> {
RefList() {
super(elements.size());
addAll(elements);

@ -29,6 +29,7 @@ import com.sun.codemodel.internal.JClass;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.xml.internal.bind.v2.model.core.TypeInfo;
@ -44,7 +45,7 @@ public interface CTypeInfo extends TypeInfo<NType,NClass>, CCustomizable {
* Returns the {@link JClass} that represents the class being bound,
* under the given {@link Outline}.
*
* @see NType#toType(Outline, Aspect)
* @see NType#toType(Outline, com.sun.tools.internal.xjc.outline.Aspect)
*/
JType toType(Outline o, Aspect aspect);
}

@ -29,6 +29,7 @@ import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.nav.NClass;
import com.sun.tools.internal.xjc.model.nav.NType;
import com.sun.tools.internal.xjc.model.nav.NavigatorImpl;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
import com.sun.xml.internal.bind.v2.model.core.WildcardTypeInfo;

@ -30,7 +30,7 @@ import java.util.HashSet;
import java.util.Set;
import com.sun.codemodel.internal.JClass;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -28,7 +28,7 @@ package com.sun.tools.internal.xjc.model.nav;
import java.lang.reflect.Type;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -26,7 +26,7 @@
package com.sun.tools.internal.xjc.model.nav;
import com.sun.codemodel.internal.JClass;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -26,7 +26,7 @@
package com.sun.tools.internal.xjc.model.nav;
import com.sun.codemodel.internal.JClass;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -26,7 +26,7 @@
package com.sun.tools.internal.xjc.model.nav;
import com.sun.codemodel.internal.JClass;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -26,7 +26,7 @@
package com.sun.tools.internal.xjc.model.nav;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
/**

@ -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
@ -23,7 +23,7 @@
* questions.
*/
package com.sun.tools.internal.xjc.model;
package com.sun.tools.internal.xjc.outline;
import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy;
@ -35,6 +35,8 @@ import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy;
* This is an enumeration of all possible aspects.
*
* @author Kohsuke Kawaguchi
*
* TODO: move this to the model package. We cannot do this before JAXB3 because of old plugins
*/
public enum Aspect {
/**

@ -33,7 +33,6 @@ import com.sun.codemodel.internal.JCodeModel;
import com.sun.codemodel.internal.JPackage;
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.ErrorReceiver;
import com.sun.tools.internal.xjc.model.Aspect;
import com.sun.tools.internal.xjc.model.CClassInfo;
import com.sun.tools.internal.xjc.model.CClassInfoParent;
import com.sun.tools.internal.xjc.model.CElementInfo;

@ -23,7 +23,7 @@
# questions.
#
build-id=2.2.11-b141124.1933
build-version=JAX-WS RI 2.2.11-b141124.1933
build-id=2.2.11-b150127.1410
build-version=JAX-WS RI 2.2.11-b150127.1410
major-version=2.2.11
svn-revision=312b19a2e0e312b55e1ea6f531bd595955cd581f
svn-revision=28121d09ed8ac02b76788709ccb4cdb66e03bbfa