Commit af3e56906064935a3eaab6ea7e32f9c2b9abbe90 - jaxb-api

New upstream version 2.3.1 Emmanuel Bourg 5 years ago

22 changed file(s) with 750 addition(s) and 642 deletion(s). Raw diff Collapse all Expand all

-1

.gitignore less more

0		/target/⏎
	0	/target/
	1	/jaxb-api/target/⏎

+131

-184

jaxb-api/pom.xml less more

0	0	<?xml version="1.0" encoding="UTF-8"?>
	1
	2	<!--
	3
	4	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	5
	6	Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
	7
	8	The contents of this file are subject to the terms of either the GNU
	9	General Public License Version 2 only ("GPL") or the Common Development
	10	and Distribution License("CDDL") (collectively, the "License"). You
	11	may not use this file except in compliance with the License. You can
	12	obtain a copy of the License at
	13	https://oss.oracle.com/licenses/CDDL+GPL-1.1
	14	or LICENSE.txt. See the License for the specific
	15	language governing permissions and limitations under the License.
	16
	17	When distributing the software, include this License Header Notice in each
	18	file and include the License file at LICENSE.txt.
	19
	20	GPL Classpath Exception:
	21	Oracle designates this particular file as subject to the "Classpath"
	22	exception as provided by Oracle in the GPL Version 2 section of the License
	23	file that accompanied this code.
	24
	25	Modifications:
	26	If applicable, add the following below the License Header, with the fields
	27	enclosed by brackets [] replaced by your own identifying information:
	28	"Portions Copyright [year] [name of copyright owner]"
	29
	30	Contributor(s):
	31	If you wish your version of this file to be governed by only the CDDL or
	32	only the GPL Version 2, indicate your decision by adding "[Contributor]
	33	elects to include this software in this distribution under the [CDDL or GPL
	34	Version 2] license." If you don't indicate a single choice of license, a
	35	recipient has the option to distribute your version of this file under
	36	either the CDDL, the GPL Version 2 or to extend the choice of license to
	37	its licensees as provided above. However, if you add GPL Version 2 code
	38	and therefore, elected the GPL Version 2 license, then the option applies
	39	only if the new code is made subject to such option by the copyright
	40	holder.
	41
	42	-->
	43
1	44	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2	45	<parent>
3	46	<artifactId>jaxb-api-parent</artifactId>
4	47	<groupId>javax.xml.bind</groupId>
5		<version>2.3.0</version>
	48	<version>2.3.1</version>
6	49	</parent>
7	50	<modelVersion>4.0.0</modelVersion>
8	51
9	52	<artifactId>jaxb-api</artifactId>
10	53	<packaging>jar</packaging>
11	54
	55	<dependencies>
	56	<dependency>
	57	<groupId>javax.activation</groupId>
	58	<artifactId>javax.activation-api</artifactId>
	59	</dependency>
	60	</dependencies>
	61
12	62	<build>
13	63
14	64	<pluginManagement>
15	65	<plugins>
16	66	<plugin>
17		<groupId>org.apache.maven.plugins</groupId>
18	67	<artifactId>maven-resources-plugin</artifactId>
19		<version>3.0.2</version>
	68	<version>3.1.0</version>
20	69	</plugin>
21	70	<plugin>
22	71	<groupId>org.glassfish.build</groupId>

35	84	</plugin>
36	85	<plugin>
37	86	<artifactId>maven-enforcer-plugin</artifactId>
38		<version>3.0.0-M1</version>
39	87	<configuration>
40	88	<rules>
41	89	<requireJavaVersion>
42		<version>[1.7,)</version>
	90	<version>[1.8,)</version>
43	91	</requireJavaVersion>
44	92	<requireMavenVersion>
45	93	<version>[3.0.3,)</version>

51	99	<plugin>
52	100	<groupId>org.codehaus.mojo</groupId>
53	101	<artifactId>cobertura-maven-plugin</artifactId>
54		<version>2.5.1</version>
	102	<version>2.7</version>
55	103	<configuration>
56	104	<formats>
57	105	<format>xml</format>

66	114	<plugin>
67	115	<groupId>org.glassfish.copyright</groupId>
68	116	<artifactId>glassfish-copyright-maven-plugin</artifactId>
69		<version>1.29</version>
	117	<version>1.49</version>
70	118	<configuration>
71	119	<templateFile>${project.basedir}/copyright.txt</templateFile>
72	120	<excludeFile>${project.basedir}/copyright-exclude</excludeFile>

81	129	</configuration>
82	130	</plugin>
83	131	<plugin>
84		<groupId>org.apache.maven.plugins</groupId>
85	132	<artifactId>maven-dependency-plugin</artifactId>
86		<version>2.3</version>
87		</plugin>
88		<plugin>
89		<groupId>org.apache.maven.plugins</groupId>
90		<artifactId>maven-surefire-plugin</artifactId>
91		<version>2.19.1</version>
92		<configuration>
93		<argLine>
94		-Xbootclasspath/p:${basedir}/target/classes
95		</argLine>
96		</configuration>
97		</plugin>
98		<plugin>
99		<groupId>org.apache.maven.plugins</groupId>
	133	<version>3.1.1</version>
	134	</plugin>
	135	<plugin>
100	136	<artifactId>maven-jar-plugin</artifactId>
101		<version>2.4</version>
	137	<version>3.1.0</version>
102	138	<configuration>
103	139	<archive>
104	140	<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

116	152	<plugin>
117	153	<groupId>org.codehaus.mojo</groupId>
118	154	<artifactId>buildnumber-maven-plugin</artifactId>
119		<version>1.1</version>
	155	<version>1.4</version>
120	156	<configuration>
121	157	<getRevisionOnlyOnce>true</getRevisionOnlyOnce>
122	158	<timestampFormat>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</timestampFormat>

128	164	<groupId>org.apache.felix</groupId>
129	165	<artifactId>maven-bundle-plugin</artifactId>
130	166	<extensions>true</extensions>
131		<version>3.3.0</version>
	167	<version>3.5.1</version>
132	168	<configuration>
133	169	<archive>
134	170	<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
135	171	</archive>
136	172	<instructions>
	173	<Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.8))"</Require-Capability>
137	174	<Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull -->
138	175	<Extension-Name>${extension.name}</Extension-Name>
139	176	<Implementation-Version>${spec.version}.${impl.version}</Implementation-Version>
140	177	<Specification-Version>${project.version}</Specification-Version>
141	178	<Export-Package>${extension.name}.*; version=${spec.version}</Export-Package>
142	179	<Import-Package>
143		javax.activation,
	180	javax.activation;version=!,
144	181	javax.xml.bind;version="[${spec.version},3)",
145	182	javax.xml.bind.annotation;version="[${spec.version},3)",
146	183	javax.xml.bind.annotation.adapters;version="[${spec.version},3)",

172	209	<plugin>
173	210	<groupId>org.codehaus.mojo</groupId>
174	211	<artifactId>findbugs-maven-plugin</artifactId>
175		<version>3.0.0</version>
	212	<version>3.0.5</version>
176	213	<configuration>
177	214	<skip>${findbugs.skip}</skip>
178	215	<threshold>${findbugs.threshold}</threshold>

192	229	</dependencies>
193	230	</plugin>
194	231	<plugin>
195		<groupId>org.apache.maven.plugins</groupId>
196	232	<artifactId>maven-javadoc-plugin</artifactId>
197		<version>3.0.0-M1</version>
198	233	<configuration>
199	234	<nodeprecated>false</nodeprecated>
200	235	<use>false</use>

244	279	<head>Implementation Note:</head>
245	280	</tag>
246	281	</tags>
247		<!-- TODO to be removed before 2.3 release-->
248		<additionalparam>-Xdoclint:none</additionalparam>
249		</configuration>
250		</plugin>
251		<plugin>
252		<groupId>org.apache.maven.plugins</groupId>
253		<artifactId>maven-source-plugin</artifactId>
254		<version>2.2.1</version>
255		</plugin>
256		<plugin>
257		<groupId>org.apache.maven.plugins</groupId>
	282	</configuration>
	283	</plugin>
	284	<plugin>
258	285	<artifactId>maven-release-plugin</artifactId>
259		<version>2.3.2</version>
260		</plugin>
261		<plugin>
262		<groupId>org.apache.maven.plugins</groupId>
263		<artifactId>maven-gpg-plugin</artifactId>
264		<version>1.1</version>
	286	</plugin>
	287	<plugin>
	288	<artifactId>maven-compiler-plugin</artifactId>
	289	<executions>
	290	<execution>
	291	<id>default-compile</id>
	292	<configuration>
	293	<release>8</release>
	294	<excludes>
	295	<exclude>module-info.java</exclude>
	296	</excludes>
	297	</configuration>
	298	</execution>
	299	<execution>
	300	<id>module-info-compile</id>
	301	<phase>test-compile</phase><!--Avoid JavaSE9 capability added by bundle-plugin-->
	302	<goals>
	303	<goal>compile</goal>
	304	</goals>
	305	<configuration>
	306	<release>9</release>
	307	<includes>
	308	<include>module-info.java</include>
	309	</includes>
	310	</configuration>
	311	</execution>
	312	</executions>
265	313	</plugin>
266	314	</plugins>
267	315	</pluginManagement>
268	316
269	317	<plugins>
270	318	<plugin>
271		<groupId>org.apache.maven.plugins</groupId>
272	319	<artifactId>maven-resources-plugin</artifactId>
273	320	<executions>
274	321	<execution>

299	346	</executions>
300	347	</plugin>
301	348	<plugin>
302		<groupId>org.apache.maven.plugins</groupId>
303	349	<artifactId>maven-dependency-plugin</artifactId>
304	350	<executions>
305	351	<execution>

336	382	</execution>
337	383	</executions>
338	384	</plugin>
	385
	386	<plugin>
	387	<artifactId>maven-antrun-plugin</artifactId>
	388	<version>1.8</version>
	389	<executions>
	390	<execution>
	391	<id>compile-java9</id>
	392	<phase>compile</phase>
	393	<configuration>
	394	<tasks>
	395	<mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
	396	<javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" source="9" target="9" />
	397	</tasks>
	398	</configuration>
	399	<goals>
	400	<goal>run</goal>
	401	</goals>
	402	</execution>
	403	<execution>
	404	<id>update-source-jar</id>
	405	<phase>verify</phase>
	406	<configuration>
	407	<tasks>
	408	<jar destfile="${project.build.directory}/jaxb-api-${project.version}-sources.jar" update="true">
	409	<fileset dir="${project.build.directory}/mr-jar/" />
	410	</jar>
	411	</tasks>
	412	</configuration>
	413	<goals>
	414	<goal>run</goal>
	415	</goals>
	416	</execution>
	417	</executions>
	418	</plugin>
339	419	</plugins>
340	420
341	421	</build>
342	422
343		<profiles>
344		<profile>
345		<id>jdk9</id>
346		<activation>
347		<jdk>9</jdk>
348		</activation>
349		<build>
350		<pluginManagement>
351		<plugins>
352		<plugin>
353		<groupId>org.codehaus.mojo</groupId>
354		<artifactId>build-helper-maven-plugin</artifactId>
355		<version>1.12</version>
356		</plugin>
357		<plugin>
358		<groupId>org.apache.maven.plugins</groupId>
359		<artifactId>maven-compiler-plugin</artifactId>
360		<executions>
361		<execution>
362		<id>default-compile</id>
363		<configuration>
364		<release>9</release>
365		<source>9</source>
366		<target>9</target>
367		<includes>
368		<include>module-info.java</include>
369		</includes>
370		</configuration>
371		</execution>
372		<execution>
373		<id>base-compile</id>
374		<goals>
375		<goal>compile</goal>
376		</goals>
377		<configuration>
378		<excludes>
379		<exclude>module-info.java</exclude>
380		</excludes>
381		</configuration>
382		</execution>
383		</executions>
384		</plugin>
385		<plugin>
386		<groupId>org.apache.felix</groupId>
387		<artifactId>maven-bundle-plugin</artifactId>
388		<configuration>
389		<instructions>
390		<_failok>true</_failok>
391		</instructions>
392		</configuration>
393		</plugin>
394		<plugin>
395		<groupId>org.apache.maven.plugins</groupId>
396		<artifactId>maven-javadoc-plugin</artifactId>
397		<version>3.0.0-M1</version>
398		<configuration>
399		<includeDependencySources>false</includeDependencySources>
400		</configuration>
401		</plugin>
402		</plugins>
403		</pluginManagement>
404		<plugins>
405		<plugin>
406		<groupId>org.codehaus.mojo</groupId>
407		<artifactId>build-helper-maven-plugin</artifactId>
408		<executions>
409		<execution>
410		<id>add-jdk9-source</id>
411		<phase>generate-sources</phase>
412		<goals>
413		<goal>add-source</goal>
414		</goals>
415		<configuration>
416		<sources>
417		<source>src/main/jdk9</source>
418		</sources>
419		</configuration>
420		</execution>
421		</executions>
422		</plugin>
423		<plugin>
424		<groupId>org.apache.maven.plugins</groupId>
425		<artifactId>maven-antrun-plugin</artifactId>
426		<executions>
427		<execution>
428		<id>compile-java9</id>
429		<phase>compile</phase>
430		<configuration>
431		<tasks>
432		<mkdir dir="${project.build.outputDirectory}/META-INF/versions/9" />
433		<javac srcdir="${mrjar.sourceDirectory}" destdir="${project.build.outputDirectory}/META-INF/versions/9" classpath="${project.build.outputDirectory}" includeantruntime="false" />
434		</tasks>
435		</configuration>
436		<goals>
437		<goal>run</goal>
438		</goals>
439		</execution>
440		<execution>
441		<id>update-source-jar</id>
442		<phase>verify</phase>
443		<configuration>
444		<tasks>
445		<jar destfile="${project.build.directory}/jaxb-api-${project.version}-sources.jar" update="true">
446		<fileset dir="${project.build.directory}/mr-jar/" />
447		</jar>
448		</tasks>
449		</configuration>
450		<goals>
451		<goal>run</goal>
452		</goals>
453		</execution>
454		</executions>
455		<configuration>
456		<skip>true</skip>
457		</configuration>
458		</plugin>
459		</plugins>
460		</build>
461		</profile>
462		<profile>
463		<!-- lukas: FIX-ME in java.net:parent -->
464		<id>jvnet-release</id>
465		<build>
466		<plugins>
467		<plugin>
468		<groupId>org.apache.maven.plugins</groupId>
469		<artifactId>maven-javadoc-plugin</artifactId>
470		<version>3.0.0-M1</version>
471		</plugin>
472		</plugins>
473		</build>
474		</profile>
475		</profiles>
476
477
478		</project>⏎
	423
	424
	425	</project>

-1

jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java less more

0	0	/*
1	1	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2	2	*
3		* Copyright (c) 2003-2017 Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2003-2018 Oracle and/or its affiliates. All rights reserved.
4	4	*
5	5	* The contents of this file are subject to the terms of either the GNU
6	6	* General Public License Version 2 only ("GPL") or the Common Development

+10

-5

jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java less more

55	55	* and for each provides a description of what the permission allows
56	56	* and a discussion of the risks of granting code the permission.
57	57	*
58		* <table border=1 cellpadding=5 summary="Permission target name, what the permission allows, and associated risks">
	58	* <table class="striped">
	59	* <caption style="display:none">Permission target name, what the permission allows, and associated risks"</caption>
	60	* <thead>
59	61	* <tr>
60		* <th>Permission Target Name</th>
61		* <th>What the Permission Allows</th>
62		* <th>Risks of Allowing this Permission</th>
	62	* <th scope="col">Permission Target Name</th>
	63	* <th scope="col">What the Permission Allows</th>
	64	* <th scope="col">Risks of Allowing this Permission</th>
63	65	* </tr>
	66	* </thead>
64	67	*
	68	* <tbody style="text-align:left">
65	69	* <tr>
66		* <td>setDatatypeConverter</td>
	70	* <th scope="row">setDatatypeConverter</th>
67	71	* <td>
68	72	* Allows the code to set VM-wide {@link DatatypeConverterInterface}
69	73	* via {@link DatatypeConverter#setDatatypeConverter(DatatypeConverterInterface) the setDatatypeConverter method}

77	81	* another application running in the same JVM.
78	82	* </td>
79	83	* </tr>
	84	* </tbody>
80	85	* </table>
81	86	*
82	87	* @see java.security.BasicPermission

+10

-10

jaxb-api/src/main/java/javax/xml/bind/Marshaller.java less more

387	387	* If the {@link ValidationEventHandler ValidationEventHandler}
388	388	* returns false from its {@code handleEvent} method or the
389	389	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
390		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	390	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
391	391	* Marshalling a JAXB element</a>.
392	392	* @throws IllegalArgumentException
393	393	* If any of the method parameters are null

409	409	* If the {@link ValidationEventHandler ValidationEventHandler}
410	410	* returns false from its {@code handleEvent} method or the
411	411	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
412		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	412	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
413	413	* Marshalling a JAXB element</a>.
414	414	* @throws IllegalArgumentException
415	415	* If any of the method parameters are null

431	431	* If the {@link ValidationEventHandler ValidationEventHandler}
432	432	* returns false from its {@code handleEvent} method or the
433	433	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
434		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	434	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
435	435	* Marshalling a JAXB element</a>.
436	436	* @throws IllegalArgumentException
437	437	* If any of the method parameters are null

454	454	* If the {@link ValidationEventHandler ValidationEventHandler}
455	455	* returns false from its {@code handleEvent} method or the
456	456	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
457		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	457	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
458	458	* Marshalling a JAXB element</a>.
459	459	* @throws IllegalArgumentException
460	460	* If any of the method parameters are null

476	476	* If the {@link ValidationEventHandler ValidationEventHandler}
477	477	* returns false from its {@code handleEvent} method or the
478	478	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
479		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	479	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
480	480	* Marshalling a JAXB element</a>.
481	481	* @throws IllegalArgumentException
482	482	* If any of the method parameters are null

502	502	* If the {@link ValidationEventHandler ValidationEventHandler}
503	503	* returns false from its {@code handleEvent} method or the
504	504	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
505		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	505	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
506	506	* Marshalling a JAXB element</a>.
507	507	* @throws IllegalArgumentException
508	508	* If any of the method parameters are null

525	525	* If the {@link ValidationEventHandler ValidationEventHandler}
526	526	* returns false from its {@code handleEvent} method or the
527	527	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
528		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	528	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
529	529	* Marshalling a JAXB element</a>.
530	530	* @throws IllegalArgumentException
531	531	* If any of the method parameters are null

549	549	* If the {@link ValidationEventHandler ValidationEventHandler}
550	550	* returns false from its {@code handleEvent} method or the
551	551	* {@code Marshaller} is unable to marshal {@code jaxbElement} (or any
552		* object reachable from {@code jaxbElement}). See <a href="#elementMarshalling">
	552	* object reachable from {@code jaxbElement}). See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#elementMarshalling">
553	553	* Marshalling a JAXB element</a>.
554	554	* @throws IllegalArgumentException
555	555	* If any of the method parameters are null

589	589	* {@code Marshaller}. This method can only be used to set one of
590	590	* the standard JAXB defined properties above or a provider specific
591	591	* property. Attempting to set an undefined property will result in
592		* a PropertyException being thrown. See <a href="#supportedProps">
	592	* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
593	593	* Supported Properties</a>.
594	594	*
595	595	* @param name the name of the property to be set. This value can either

610	610	* {@code Marshaller}. This method can only be used to get one of
611	611	* the standard JAXB defined properties above or a provider specific
612	612	* property. Attempting to get an undefined property will result in
613		* a PropertyException being thrown. See <a href="#supportedProps">
	613	* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Marshaller.html#supportedProps">
614	614	* Supported Properties</a>.
615	615	*
616	616	* @param name the name of the property to retrieve

+47

-50

jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java less more

199	199	* Unmarshalling can deserialize XML data that represents either an entire XML document
200	200	* or a subtree of an XML document. Typically, it is sufficient to use the
201	201	* unmarshalling methods described by
202		* <a href="#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
	202	* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal root element that is declared globally</a>.
203	203	* These unmarshal methods utilize {@link JAXBContext}'s mapping of global XML element
204	204	* declarations and type definitions to JAXB mapped classes to initiate the
205	205	* unmarshalling of the root element of XML data. When the {@link JAXBContext}'s
206	206	* mappings are not sufficient to unmarshal the root element of XML data,
207	207	* the application can assist the unmarshalling process by using the
208		* <a href="#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
	208	* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType methods</a>.
209	209	* These methods are useful for unmarshalling XML data where
210	210	* the root element corresponds to a local element declaration in the schema.
211	211	* </blockquote>

258	258	* instance are set.
259	259	*
260	260	* <a name="unmarshalDeclaredTypeReturn"></a>
261		* <table summary="" border="2" rules="all" cellpadding="4">
	261	* <table class="striped">
	262	* <caption>Unmarshal By Declared Type returned JAXBElement</caption>
262	263	* <thead>
263	264	* <tr>
264		* <th align="center" colspan="2">
265		* Unmarshal By Declared Type returned JAXBElement
	265	* <th scope="col">JAXBElement Property</th>
	266	* <th scope="col">Value</th>
266	267	* </tr>
267	268	* <tr>
268		* <th>JAXBElement Property</th>
269		* <th>Value</th>
270		* </tr>
271		* <tr>
272		* <td>name</td>
273		* <td>{@code xml element name}</td>
	269	* <th scope="col">name</th>
	270	* <th scope="col">{@code xml element name}</th>
274	271	* </tr>
275	272	* </thead>
276	273	* <tbody>
277	274	* <tr>
278		* <td>value</td>
	275	* <th scope="row">value</th>
279	276	* <td>{@code instanceof declaredType}</td>
280	277	* </tr>
281	278	* <tr>
282		* <td>declaredType</td>
	279	* <th scope="row">declaredType</th>
283	280	* <td>unmarshal method {@code declaredType} parameter</td>
284	281	* </tr>
285	282	* <tr>
286		* <td>scope</td>
	283	* <th scope="row">scope</th>
287	284	* <td>{@code null} <i>(actual scope is unknown)</i></td>
288	285	* </tr>
289	286	* </tbody>

292	289	*
293	290	* <p>
294	291	* The following is an example of
295		* <a href="#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
	292	* <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType method</a>.
296	293	* <p>
297	294	* Unmarshal by declaredType from a {@code org.w3c.dom.Node}:
298	295	* <blockquote>

427	424	* content tree.
428	425	*
429	426	* <p>
430		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	427	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
431	428	*
432	429	* @param f the file to unmarshal XML data from
433	430	* @return the newly created root object of the java content tree

438	435	* If the {@link ValidationEventHandler ValidationEventHandler}
439	436	* returns false from its {@code handleEvent} method or the
440	437	* {@code Unmarshaller} is unable to perform the XML to Java
441		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	438	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
442	439	* @throws IllegalArgumentException
443	440	* If the file parameter is null
444	441	*/

450	447	* be incomplete when using this form of the unmarshal API.
451	448	*
452	449	* <p>
453		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	450	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
454	451	*
455	452	* @param is the InputStream to unmarshal XML data from
456	453	* @return the newly created root object of the java content tree

461	458	* If the {@link ValidationEventHandler ValidationEventHandler}
462	459	* returns false from its {@code handleEvent} method or the
463	460	* {@code Unmarshaller} is unable to perform the XML to Java
464		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	461	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
465	462	* @throws IllegalArgumentException
466	463	* If the InputStream parameter is null
467	464	*/

474	471	* because a Reader does not provide the system ID.
475	472	*
476	473	* <p>
477		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	474	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
478	475	*
479	476	* @param reader the Reader to unmarshal XML data from
480	477	* @return the newly created root object of the java content tree

485	482	* If the {@link ValidationEventHandler ValidationEventHandler}
486	483	* returns false from its {@code handleEvent} method or the
487	484	* {@code Unmarshaller} is unable to perform the XML to Java
488		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	485	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
489	486	* @throws IllegalArgumentException
490	487	* If the InputStream parameter is null
491	488	* @since 1.6, JAXB 2.0

497	494	* content tree.
498	495	*
499	496	* <p>
500		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	497	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
501	498	*
502	499	* @param url the url to unmarshal XML data from
503	500	* @return the newly created root object of the java content tree

508	505	* If the {@link ValidationEventHandler ValidationEventHandler}
509	506	* returns false from its {@code handleEvent} method or the
510	507	* {@code Unmarshaller} is unable to perform the XML to Java
511		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	508	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
512	509	* @throws IllegalArgumentException
513	510	* If the URL parameter is null
514	511	*/

519	516	* resulting content tree.
520	517	*
521	518	* <p>
522		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	519	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
523	520	*
524	521	* @param source the input source to unmarshal XML data from
525	522	* @return the newly created root object of the java content tree

530	527	* If the {@link ValidationEventHandler ValidationEventHandler}
531	528	* returns false from its {@code handleEvent} method or the
532	529	* {@code Unmarshaller} is unable to perform the XML to Java
533		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	530	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
534	531	* @throws IllegalArgumentException
535	532	* If the InputSource parameter is null
536	533	*/

541	538	* content tree.
542	539	*
543	540	* <p>
544		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	541	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
545	542	*
546	543	* @param node
547	544	* the document/element to unmarshal XML data from.

554	551	* If the {@link ValidationEventHandler ValidationEventHandler}
555	552	* returns false from its {@code handleEvent} method or the
556	553	* {@code Unmarshaller} is unable to perform the XML to Java
557		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	554	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
558	555	* @throws IllegalArgumentException
559	556	* If the Node parameter is null
560	557	* @see #unmarshal(org.w3c.dom.Node, Class)

566	563	* and return the resulting content tree.
567	564	*
568	565	* <p>
569		* Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
	566	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
570	567	*
571	568	* @param node
572	569	* the document/element to unmarshal XML data from.

574	571	* @param declaredType
575	572	* appropriate JAXB mapped class to hold {@code node}'s XML data.
576	573	*
577		* @return <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
	574	* @return <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a> representation of {@code node}
578	575	*
579	576	* @throws JAXBException
580	577	* If any unexpected errors occur while unmarshalling

582	579	* If the {@link ValidationEventHandler ValidationEventHandler}
583	580	* returns false from its {@code handleEvent} method or the
584	581	* {@code Unmarshaller} is unable to perform the XML to Java
585		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	582	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
586	583	* @throws IllegalArgumentException
587	584	* If any parameter is null
588	585	* @since 1.6, JAXB 2.0

594	591	* resulting content tree.
595	592	*
596	593	* <p>
597		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	594	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
598	595	*
599	596	* <p>
600	597	* <a name="saxParserPlugable"></a>

640	637	* If the {@link ValidationEventHandler ValidationEventHandler}
641	638	* returns false from its {@code handleEvent} method or the
642	639	* {@code Unmarshaller} is unable to perform the XML to Java
643		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	640	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
644	641	* @throws IllegalArgumentException
645	642	* If the Source parameter is null
646	643	* @see #unmarshal(javax.xml.transform.Source, Class)

654	651	* resulting content tree.
655	652	*
656	653	* <p>
657		* Implements <a href="#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
658		*
659		* <p>
660		* See <a href="#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
	654	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">Unmarshal by Declared Type</a>
	655	*
	656	* <p>
	657	* See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#saxParserPlugable">SAX 2.0 Parser Pluggability</a>
661	658	*
662	659	* @param source the XML Source to unmarshal XML data from (providers are
663	660	* only required to support SAXSource, DOMSource, and StreamSource)
664	661	* @param declaredType
665	662	* appropriate JAXB mapped class to hold {@code source}'s xml root element
666		* @return Java content rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element</a>
	663	* @return Java content rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element</a>
667	664	*
668	665	* @throws JAXBException
669	666	* If any unexpected errors occur while unmarshalling

671	668	* If the {@link ValidationEventHandler ValidationEventHandler}
672	669	* returns false from its {@code handleEvent} method or the
673	670	* {@code Unmarshaller} is unable to perform the XML to Java
674		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	671	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
675	672	* @throws IllegalArgumentException
676	673	* If any parameter is null
677	674	* @since 1.6, JAXB 2.0

684	681	* resulting content tree.
685	682	*
686	683	* <p>
687		* Implements <a href="#unmarshalGlobal">Unmarshal Global Root Element</a>.
	684	* Implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root Element</a>.
688	685	*
689	686	* <p>
690	687	* This method assumes that the parser is on a START_DOCUMENT or

704	701	* If the {@link ValidationEventHandler ValidationEventHandler}
705	702	* returns false from its {@code handleEvent} method or the
706	703	* {@code Unmarshaller} is unable to perform the XML to Java
707		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	704	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
708	705	* @throws IllegalArgumentException
709	706	* If the {@code reader} parameter is null
710	707	* @throws IllegalStateException

721	718	* and return the resulting content tree.
722	719	*
723	720	* <p>
724		* This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
	721	* This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
725	722	* <p>
726	723	* This method assumes that the parser is on a START_DOCUMENT or
727	724	* START_ELEMENT event. Unmarshalling will be done from this

734	731	* @param declaredType
735	732	* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
736	733	*
737		* @return content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
	734	* @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
738	735	*
739	736	* @throws JAXBException
740	737	* If any unexpected errors occur while unmarshalling

742	739	* If the {@link ValidationEventHandler ValidationEventHandler}
743	740	* returns false from its {@code handleEvent} method or the
744	741	* {@code Unmarshaller} is unable to perform the XML to Java
745		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	742	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
746	743	* @throws IllegalArgumentException
747	744	* If any parameter is null
748	745	* @since 1.6, JAXB 2.0

754	751	* resulting content tree.
755	752	*
756	753	* <p>
757		* This method is an <a href="#unmarshalGlobal">Unmarshal Global Root method</a>.
	754	* This method is an <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalGlobal">Unmarshal Global Root method</a>.
758	755	*
759	756	* <p>
760	757	* This method assumes that the parser is on a START_DOCUMENT or

774	771	* If the {@link ValidationEventHandler ValidationEventHandler}
775	772	* returns false from its {@code handleEvent} method or the
776	773	* {@code Unmarshaller} is unable to perform the XML to Java
777		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	774	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
778	775	* @throws IllegalArgumentException
779	776	* If the {@code reader} parameter is null
780	777	* @throws IllegalStateException

791	788	* and return the resulting content tree.
792	789	*
793	790	* <p>
794		* This method implements <a href="#unmarshalByDeclaredType">unmarshal by declaredType</a>.
	791	* This method implements <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalByDeclaredType">unmarshal by declaredType</a>.
795	792	*
796	793	* <p>
797	794	* This method assumes that the parser is on a START_DOCUMENT or

805	802	* @param declaredType
806	803	* appropriate JAXB mapped class to hold {@code reader}'s START_ELEMENT XML data.
807	804	*
808		* @return content tree rooted by <a href="#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
	805	* @return content tree rooted by <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalDeclaredTypeReturn">JAXB Element representation</a>
809	806	*
810	807	* @throws JAXBException
811	808	* If any unexpected errors occur while unmarshalling

813	810	* If the {@link ValidationEventHandler ValidationEventHandler}
814	811	* returns false from its {@code handleEvent} method or the
815	812	* {@code Unmarshaller} is unable to perform the XML to Java
816		* binding. See <a href="#unmarshalEx">Unmarshalling XML Data</a>
	813	* binding. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#unmarshalEx">Unmarshalling XML Data</a>
817	814	* @throws IllegalArgumentException
818	815	* If any parameter is null
819	816	* @since 1.6, JAXB 2.0

926	923	* {@code Unmarshaller}. This method can only be used to set one of
927	924	* the standard JAXB defined properties above or a provider specific
928	925	* property. Attempting to set an undefined property will result in
929		* a PropertyException being thrown. See <a href="#supportedProps">
	926	* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
930	927	* Supported Properties</a>.
931	928	*
932	929	* @param name the name of the property to be set. This value can either

947	944	* {@code Unmarshaller}. This method can only be used to get one of
948	945	* the standard JAXB defined properties above or a provider specific
949	946	* property. Attempting to get an undefined property will result in
950		* a PropertyException being thrown. See <a href="#supportedProps">
	947	* a PropertyException being thrown. See <a href="{@docRoot}/javax/xml/bind/Unmarshaller.html#supportedProps">
951	948	* Supported Properties</a>.
952	949	*
953	950	* @param name the name of the property to retrieve

+14

-11

jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java less more

50	50	* The namespace qualification values are used in the annotations
51	51	* defined in this packge. The enumeration values are mapped as follows:
52	52	*
53		* <table summary="" border="1" cellpadding="4" cellspacing="3">
	53	* <table class="striped">
	54	* <caption style="display:none">Mapping of enumeration values</caption>
	55	* <thead>
	56	* <tr>
	57	* <th scope="col">Enum Value</th>
	58	* <th scope="col">XML Schema Value</th>
	59	* </tr>
	60	* </thead>
	61	*
54	62	* <tbody>
55	63	* <tr>
56		* <td><b>Enum Value</b></td>
57		* <td><b>XML Schema Value</b></td>
58		* </tr>
59		*
60		* <tr valign="top">
61		* <td>UNQUALIFIED</td>
	64	* <th scope="row">UNQUALIFIED</th>
62	65	* <td>unqualified</td>
63	66	* </tr>
64		* <tr valign="top">
65		* <td>QUALIFIED</td>
	67	* <tr>
	68	* <th scope="row">QUALIFIED</th>
66	69	* <td>qualified</td>
67	70	* </tr>
68		* <tr valign="top">
69		* <td>UNSET</td>
	71	* <tr>
	72	* <th scope="row">UNSET</th>
70	73	* <td>namespace qualification attribute is absent from the
71	74	* XML Schema fragment</td>
72	75	* </tr>

+21

-19

jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java less more

127	127	* complex type or simple type. The notational symbols used in the table are:
128	128	* <ul>
129	129	* <li> {@literal ->} : represents a mapping </li>
130		* <li> [x]+ : one or more occurances of x </li>
	130	* <li> [x]+ : one or more occurrences of x </li>
131	131	* <li> [ {@code @XmlValue} property ]: JavaBean property annotated with
132	132	* {@code @XmlValue}</li>
133	133	* <li> X : don't care
134	134	* </ul>
135	135	* <blockquote>
136		* <table summary="" border="1" cellpadding="4" cellspacing="3">
	136	* <table class="striped" summary="Mapping class to XML Schema simple type">
	137	* <thead>
	138	* <tr>
	139	* <th scope="col">Target</th>
	140	* <th scope="col">propOrder</th>
	141	* <th scope="col">ClassBody</th>
	142	* <th scope="col">ComplexType</th>
	143	* <th scope="col">SimpleType</th>
	144	* </tr>
	145	* </thead>
	146	*
137	147	* <tbody>
138	148	* <tr>
139		* <td><b>Target</b></td>
140		* <td><b>propOrder</b></td>
141		* <td><b>ClassBody</b></td>
142		* <td><b>ComplexType</b></td>
143		* <td><b>SimpleType</b></td>
144		* </tr>
145		*
146		* <tr valign="top">
147	149	* <td>Class</td>
148	150	* <td>{}</td>
149		* <td>[property]+ {@literal ->} elements</td>
	151	* <th scope="row">[property]+ {@literal ->} elements</th>
150	152	* <td>complexcontent<br>xs:all</td>
151	153	* <td> </td>
152	154	* </tr>
153	155	*
154		* <tr valign="top">
	156	* <tr>
155	157	* <td>Class</td>
156	158	* <td>non empty</td>
157		* <td>[property]+ {@literal ->} elements</td>
	159	* <th scope="row">[property]+ {@literal ->} elements</th>
158	160	* <td>complexcontent<br>xs:sequence</td>
159	161	* <td> </td>
160	162	* </tr>
161	163	*
162		* <tr valign="top">
	164	* <tr>
163	165	* <td>Class</td>
164	166	* <td>X</td>
165		* <td>no property {@literal ->} element</td>
	167	* <th scope="row">no property {@literal ->} element</th>
166	168	* <td>complexcontent<br>empty sequence</td>
167	169	* <td> </td>
168	170	* </tr>
169	171	*
170		* <tr valign="top">
	172	* <tr>
171	173	* <td>Class</td>
172	174	* <td>X</td>
173		* <td>1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</td>
	175	* <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> [property]+ {@literal ->} attributes</th>
174	176	* <td>simplecontent</td>
175	177	* <td> </td>
176	178	* </tr>
177	179	*
178		* <tr valign="top">
	180	* <tr>
179	181	* <td>Class</td>
180	182	* <td>X</td>
181		* <td>1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</td>
	183	* <th scope="row">1 [{@code @XmlValue} property] {@literal &&} <br> no properties {@literal ->} attribute</th>
182	184	* <td> </td>
183	185	* <td>simpletype</td>
184	186	* </tr>

-5

jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java less more

40	40	/**
41	41	* {@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
42	42	* sub-classes to allow arbitrary Java classes to be used with JAXB.
43		* <p>
	43	*
44	44	* <h2>Package Specification</h2>
45		* <p>
	45	*
46	46	* <ul>
47	47	* <li><a href="http://jcp.org/en/jsr/detail?id=222">JAXB Specification</a>
48	48	* </ul>
49		* <p>
	49	*
50	50	* <h2>Related Documentation</h2>
51		* <p>
	51	*
52	52	* For overviews, tutorials, examples, guides, and tool documentation,
53	53	* please see:
54	54	* <ul>

57	57	*
58	58	* @see <a href="http://jaxb.java.net">JAXB Website</a>
59	59	*/
60		package javax.xml.bind.annotation.adapters;⏎
	60	package javax.xml.bind.annotation.adapters;

+110

-188

jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java less more

44	44	* <p>The following table shows the JAXB mapping annotations
45	45	* that can be associated with each program element. </p>
46	46	* <p>
47		* <table border="1" cellpadding="4" cellspacing="3" summary="test0">
48		* <tbody>
49		* <tr>
50		* <td><b>Program Element</b></td>
51		* <td><b>JAXB annotation</b></td>
52		* </tr>
53		* <tr valign="top">
54		* <td><b>Package</b></td>
55		* <td>
56		* <table summary="test">
57		* <tr valign="top">
58		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
59		* </tr>
60		* <tr valign="top">
61		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
62		* </tr>
63		* <tr valign="top">
64		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></b></td>
65		* </tr>
66		* <tr valign="top">
67		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></b></td>
68		* </tr>
69		* <tr valign="top">
70		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></b></td>
71		* </tr>
72		* <tr valign="top">
73		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
74		* </tr>
75		* <tr valign="top">
76		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></b></td>
77		* </tr>
78		* </table>
79		* </td>
80		* </tr>
81		* <tr valign="top">
82		* <td><b>Class</b></td>
83		* <td>
84		* <table summary="test2">
85		* <tr valign="top">
86		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></b></td>
87		* </tr>
88		* <tr valign="top">
89		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></b></td>
90		* </tr>
91		* <tr valign="top">
92		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
93		* </tr>
94		* <tr valign="top">
95		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
96		* </tr>
97		* <tr valign="top">
98		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
99		* </tr>
100		* <tr valign="top">
101		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
102		* </tr>
103		* </table>
104		* </td>
105		* </tr>
106		* <tr valign="top">
107		* <td><b>Enum type</b></td>
108		* <td>
109		* <table summary="test3">
110		* <tr valign="top">
111		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></b></td>
112		* </tr>
113		* <tr valign="top">
114		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></b></td>
115		* </tr>
116		* <tr valign="top">
117		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></b></td>
118		* </tr>
119		* <tr valign="top">
120		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></b></td>
121		* </tr>
122		* <tr valign="top">
123		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
124		* </tr>
125		* </table>
126		* </td>
127		* </tr>
128		* <tr valign="top">
129		* <td><b>JavaBean Property/field</b></td>
130		* <td>
131		* <table summary="test4">
132		* <tr valign="top">
133		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></b></td>
134		* </tr>
135		* <tr valign="top">
136		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></b></td>
137		* </tr>
138		* <tr valign="top">
139		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></b></td>
140		* </tr>
141		* <tr valign="top">
142		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></b></td>
143		* </tr>
144		* <tr valign="top">
145		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></b></td>
146		* </tr>
147		* <tr valign="top">
148		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></b></td>
149		* </tr>
150		* <tr valign="top">
151		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></b></td>
152		* </tr>
153		* <tr valign="top">
154		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></b></td>
155		* </tr>
156		* <tr valign="top">
157		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></b></td>
158		* </tr>
159		* <tr valign="top">
160		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></b></td>
161		* </tr>
162		* <tr valign="top">
163		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></b></td>
164		* </tr>
165		* <tr valign="top">
166		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></b></td>
167		* </tr>
168		* <tr valign="top">
169		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
170		* </tr>
171		* <tr valign="top">
172		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></b></td>
173		* </tr>
174		* <tr valign="top">
175		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
176		* </tr>
177		* <tr valign="top">
178		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
179		* </tr>
180		* <tr valign="top">
181		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></b></td>
182		* </tr>
183		* <tr valign="top">
184		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></b></td>
185		* </tr>
186		* <tr valign="top">
187		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
188		* </tr>
189		* </table>
190		* </td>
191		* </tr>
192		* <tr valign="top">
193		* <td><b>Parameter</b></td>
194		* <td>
195		* <table summary="test5">
196		* <tr valign="top">
197		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></b></td>
198		* </tr>
199		* <tr valign="top">
200		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></b></td>
201		* </tr>
202		* <tr valign="top">
203		* <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></b></td>
204		* </tr>
205		* <tr valign="top">
206		* <td><b><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></b></td>
207		* </tr>
208		* </table>
209		* </td>
210		* </tr>
	47	* <table class="striped" summary="Annotations for customizing Java program elements to XML Schema mapping">
	48	* <thead>
	49	* <tr>
	50	* <th scope="col">Program Element</th>
	51	* <th scope="col">JAXB annotation</th>
	52	* </tr>
	53	* </thead>
	54	* <tbody style="text-align:left">
	55	* <tr>
	56	* <th scope="row" style="vertical-align:top">Package</th>
	57	* <td>
	58	* <ul style="list-style-type:none">
	59	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
	60	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
	61	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></li>
	62	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></li>
	63	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></li>
	64	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
	65	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></li>
	66	* </ul>
	67	* </td>
	68	* </tr>
	69	* <tr>
	70	* <th scope="row" style="vertical-align:top">Class</th>
	71	* <td>
	72	* <ul style="list-style-type:none">
	73	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
	74	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
	75	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
	76	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
	77	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
	78	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
	79	* </ul>
	80	* </td>
	81	* </tr>
	82	* <tr>
	83	* <th scope="row" style="vertical-align:top">Enum type</th>
	84	* <td>
	85	* <ul style="list-style-type:none">
	86	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></li>
	87	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></li>
	88	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
	89	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
	90	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
	91	* </ul>
	92	* </td>
	93	* </tr>
	94	* <tr>
	95	* <th scope="row" style="vertical-align:top">JavaBean Property/field</th>
	96	* <td>
	97	* <ul style="list-style-type:none">
	98	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></li>
	99	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></li>
	100	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></li>
	101	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></li>
	102	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></li>
	103	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></li>
	104	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></li>
	105	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></li>
	106	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></li>
	107	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></li>
	108	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></li>
	109	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></li>
	110	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
	111	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></li>
	112	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
	113	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
	114	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
	115	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></li>
	116	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
	117	* </ul>
	118	* </td>
	119	* </tr>
	120	* <tr>
	121	* <th scope="row" style="vertical-align:top">Parameter</th>
	122	* <td>
	123	* <ul style="list-style-type:none">
	124	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
	125	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
	126	* <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
	127	* <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
	128	* </ul>
	129	* </td>
	130	* </tr>
211	131	* </tbody>
212	132	* </table>
213	133	* <h3>Terminology</h3>

250	170	* <p>The following namespace prefixes are used in the XML Schema
251	171	* fragments in this package.
252	172	* <p>
253		* <table border="1" cellpadding="4" cellspacing="3" summary="test6">
254		* <tbody>
255		* <tr>
256		* <td><b>Prefix</b></td>
257		* <td><b>Namespace</b></td>
258		* <td><b>Notes</b></td>
259		* </tr>
260		* <tr valign="top">
261		* <td>xs</td>
262		* <td>http://www.w3.org/2001/XMLSchema</td>
263		* <td>Namespace of XML Schema namespace</td>
264		* </tr>
265		* <tr valign="top">
266		* <td>ref</td>
267		* <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
268		* <td>Namespace for swaref schema component</td>
269		* </tr>
270		* <tr valign="top">
271		* <td>xsi</td>
272		* <td>http://www.w3.org/2001/XMLSchema-instance</td>
273		* <td>XML Schema namespace for instances</td>
274		* </tr>
275		* </tbody>
	173	* <table class="striped" summary="XML Schema fragments namespace prefixes">
	174	* <thead>
	175	* <tr>
	176	* <th scope="col">Prefix</th>
	177	* <th scope="col">Namespace</th>
	178	* <th scope="col">Notes</th>
	179	* </tr>
	180	* </thead>
	181	* <tbody>
	182	* <tr>
	183	* <th scope="row">xs</th>
	184	* <td>http://www.w3.org/2001/XMLSchema</td>
	185	* <td>Namespace of XML Schema namespace</td>
	186	* </tr>
	187	* <tr>
	188	* <th scope="row">ref</th>
	189	* <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
	190	* <td>Namespace for swaref schema component</td>
	191	* </tr>
	192	* <tr>
	193	* <th scope="row">xsi</th>
	194	* <td>http://www.w3.org/2001/XMLSchema-instance</td>
	195	* <td>XML Schema namespace for instances</td>
	196	* </tr>
	197	* </tbody>
276	198	* </table>
277	199	*
278	200	* @since 1.6, JAXB 2.0
279	201	*/
280		package javax.xml.bind.annotation;⏎
	202	package javax.xml.bind.annotation;

+10

-13

jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java less more

86	86	*
87	87	* <p>The returned {@code DataHandler} instance must be configured
88	88	* to meet the following required mapping constaint.
89		* <table summary="" border="2" rules="all" cellpadding="4">
	89	* <table class="striped">
	90	* <caption>Required Mappings between MIME and Java Types</caption>
90	91	* <thead>
91	92	* <tr>
92		* <th align="center" colspan="2">
93		* Required Mappings between MIME and Java Types
	93	* <th scope="col">MIME Type</th>
	94	* <th scope="col">Java Type</th>
94	95	* </tr>
95	96	* <tr>
96		* <th>MIME Type</th>
97		* <th>Java Type</th>
98		* </tr>
99		* <tr>
100		* <th>{@code DataHandler.getContentType()}</th>
101		* <th>{@code instanceof DataHandler.getContent()}</th>
	97	* <th scope="col">{@code DataHandler.getContentType()}</th>
	98	* <th scope="col">{@code instanceof DataHandler.getContent()}</th>
102	99	* </tr>
103	100	* </thead>
104		* <tbody>
	101	* <tbody style="text-align:left">
105	102	* <tr>
106		* <td>image/gif</td>
	103	* <th scope="row">image/gif</th>
107	104	* <td>java.awt.Image</td>
108	105	* </tr>
109	106	* <tr>
110		* <td>image/jpeg</td>
	107	* <th scope="row">image/jpeg</th>
111	108	* <td>java.awt.Image</td>
112	109	* </tr>
113	110	* <tr>
114		* <td>text/xml or application/xml</td>
	111	* <th scope="row">text/xml or application/xml</th>
115	112	* <td>javax.xml.transform.Source</td>
116	113	* </tr>
117	114	* </tbody>

-5

jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java less more

40	40	/**
41	41	* <B>JAXB Provider Use Only:</b> Provides partial default implementations for
42	42	* some of the <code>javax.xml.bind</code> interfaces.
43		* <p>
	43	*
44	44	* <p>
45	45	* JAXB Providers can extend these classes and implement the abstract
46	46	* methods.
47		* <p>
	47	*
48	48	* <h2>Package Specification</h2>
49		* <p>
	49	*
50	50	* <ul>
51	51	* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
52	52	* </ul>
53		* <p>
	53	*
54	54	* <h2>Related Documentation</h2>
55	55	* <p>
56	56	* For overviews, tutorials, examples, guides, and tool documentation,

61	61	*
62	62	* @see <a href="https://jaxb.java.net/">JAXB Website</a>
63	63	*/
64		package javax.xml.bind.helpers;⏎
	64	package javax.xml.bind.helpers;

-4

jaxb-api/src/main/java/javax/xml/bind/util/package-info.java less more

39	39
40	40	/**
41	41	* Useful client utility classes.
42		* <p>
	42	*
43	43	* <h2>Package Specification</h2>
44		* <p>
	44	*
45	45	* <ul>
46	46	* <li><a href="https://jaxb.java.net/">JAXB Specification</a>
47	47	* </ul>
48		* <p>
	48	*
49	49	* <h2>Related Documentation</h2>
50	50	* <p>
51	51	* For overviews, tutorials, examples, guides, and tool documentation,

56	56	*
57	57	* @see <a href="https://jaxb.java.net/">JAXB Website</a>
58	58	*/
59		package javax.xml.bind.util;⏎
	59	package javax.xml.bind.util;

+55

-0

jaxb-api/src/main/java/module-info.java less more

	0	/*
	1	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	2	*
	3	* Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
	4	*
	5	* The contents of this file are subject to the terms of either the GNU
	6	* General Public License Version 2 only ("GPL") or the Common Development
	7	* and Distribution License("CDDL") (collectively, the "License"). You
	8	* may not use this file except in compliance with the License. You can
	9	* obtain a copy of the License at
	10	* https://oss.oracle.com/licenses/CDDL+GPL-1.1
	11	* or LICENSE.txt. See the License for the specific
	12	* language governing permissions and limitations under the License.
	13	*
	14	* When distributing the software, include this License Header Notice in each
	15	* file and include the License file at LICENSE.txt.
	16	*
	17	* GPL Classpath Exception:
	18	* Oracle designates this particular file as subject to the "Classpath"
	19	* exception as provided by Oracle in the GPL Version 2 section of the License
	20	* file that accompanied this code.
	21	*
	22	* Modifications:
	23	* If applicable, add the following below the License Header, with the fields
	24	* enclosed by brackets [] replaced by your own identifying information:
	25	* "Portions Copyright [year] [name of copyright owner]"
	26	*
	27	* Contributor(s):
	28	* If you wish your version of this file to be governed by only the CDDL or
	29	* only the GPL Version 2, indicate your decision by adding "[Contributor]
	30	* elects to include this software in this distribution under the [CDDL or GPL
	31	* Version 2] license." If you don't indicate a single choice of license, a
	32	* recipient has the option to distribute your version of this file under
	33	* either the CDDL, the GPL Version 2 or to extend the choice of license to
	34	* its licensees as provided above. However, if you add GPL Version 2 code
	35	* and therefore, elected the GPL Version 2 license, then the option applies
	36	* only if the new code is made subject to such option by the copyright
	37	* holder.
	38	*/
	39
	40	module java.xml.bind {
	41	requires transitive java.activation;
	42	requires transitive java.xml;
	43	requires java.logging;
	44	requires java.desktop;
	45
	46	exports javax.xml.bind;
	47	exports javax.xml.bind.annotation;
	48	exports javax.xml.bind.annotation.adapters;
	49	exports javax.xml.bind.attachment;
	50	exports javax.xml.bind.helpers;
	51	exports javax.xml.bind.util;
	52
	53	uses javax.xml.bind.JAXBContextFactory;
	54	}

-55

~~jaxb-api/src/main/jdk9/module-info.java~~ less more

0		/*
1		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2		*
3		* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
4		*
5		* The contents of this file are subject to the terms of either the GNU
6		* General Public License Version 2 only ("GPL") or the Common Development
7		* and Distribution License("CDDL") (collectively, the "License"). You
8		* may not use this file except in compliance with the License. You can
9		* obtain a copy of the License at
10		* https://oss.oracle.com/licenses/CDDL+GPL-1.1
11		* or LICENSE.txt. See the License for the specific
12		* language governing permissions and limitations under the License.
13		*
14		* When distributing the software, include this License Header Notice in each
15		* file and include the License file at LICENSE.txt.
16		*
17		* GPL Classpath Exception:
18		* Oracle designates this particular file as subject to the "Classpath"
19		* exception as provided by Oracle in the GPL Version 2 section of the License
20		* file that accompanied this code.
21		*
22		* Modifications:
23		* If applicable, add the following below the License Header, with the fields
24		* enclosed by brackets [] replaced by your own identifying information:
25		* "Portions Copyright [year] [name of copyright owner]"
26		*
27		* Contributor(s):
28		* If you wish your version of this file to be governed by only the CDDL or
29		* only the GPL Version 2, indicate your decision by adding "[Contributor]
30		* elects to include this software in this distribution under the [CDDL or GPL
31		* Version 2] license." If you don't indicate a single choice of license, a
32		* recipient has the option to distribute your version of this file under
33		* either the CDDL, the GPL Version 2 or to extend the choice of license to
34		* its licensees as provided above. However, if you add GPL Version 2 code
35		* and therefore, elected the GPL Version 2 license, then the option applies
36		* only if the new code is made subject to such option by the copyright
37		* holder.
38		*/
39
40		module java.xml.bind {
41		requires transitive java.activation;
42		requires transitive java.xml;
43		requires java.logging;
44		requires java.desktop;
45
46		exports javax.xml.bind;
47		exports javax.xml.bind.annotation;
48		exports javax.xml.bind.annotation.adapters;
49		exports javax.xml.bind.attachment;
50		exports javax.xml.bind.helpers;
51		exports javax.xml.bind.util;
52
53		uses javax.xml.bind.JAXBContextFactory;
54		}

-6

jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java less more

141	141	*
142	142	* @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module.
143	143	*/
144		static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException {
	144	public static void delegateAddOpensToImplModule(Class[] classes, Class<?> factorySPI) throws JAXBException {
145	145	final Module implModule = factorySPI.getModule();
146	146
147	147	Module jaxbModule = JAXBContext.class.getModule();
148	148
149	149	for (Class cls : classes) {
150		final Module classModule = cls.getModule();
151		final String packageName = cls.getPackageName();
152		//no need for unnamed
153		if (!classModule.isNamed()) {
	150	Class jaxbClass = cls.isArray() ?
	151	cls.getComponentType() : cls;
	152
	153	final Module classModule = jaxbClass.getModule();
	154	final String packageName = jaxbClass.getPackageName();
	155	//no need for unnamed and java.base types
	156	if (!classModule.isNamed() \|\| classModule.getName().equals("java.base")) {
154	157	continue;
155	158	}
156	159	//report error if they are not open to java.xml.bind
157	160	if (!classModule.isOpen(packageName, jaxbModule)) {
158	161	throw new JAXBException(Messages.format(Messages.JAXB_CLASSES_NOT_OPEN,
159		packageName, cls.getName(), classModule.getName()));
	162	packageName, jaxbClass.getName(), classModule.getName()));
160	163	}
161	164	//propagate openness to impl module
162	165	classModule.addOpens(packageName, implModule);

+79

-62

jaxb-api-test/pom.xml less more

0	0	<?xml version="1.0" encoding="UTF-8"?>
	1
	2	<!--
	3
	4	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	5
	6	Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
	7
	8	The contents of this file are subject to the terms of either the GNU
	9	General Public License Version 2 only ("GPL") or the Common Development
	10	and Distribution License("CDDL") (collectively, the "License"). You
	11	may not use this file except in compliance with the License. You can
	12	obtain a copy of the License at
	13	https://oss.oracle.com/licenses/CDDL+GPL-1.1
	14	or LICENSE.txt. See the License for the specific
	15	language governing permissions and limitations under the License.
	16
	17	When distributing the software, include this License Header Notice in each
	18	file and include the License file at LICENSE.txt.
	19
	20	GPL Classpath Exception:
	21	Oracle designates this particular file as subject to the "Classpath"
	22	exception as provided by Oracle in the GPL Version 2 section of the License
	23	file that accompanied this code.
	24
	25	Modifications:
	26	If applicable, add the following below the License Header, with the fields
	27	enclosed by brackets [] replaced by your own identifying information:
	28	"Portions Copyright [year] [name of copyright owner]"
	29
	30	Contributor(s):
	31	If you wish your version of this file to be governed by only the CDDL or
	32	only the GPL Version 2, indicate your decision by adding "[Contributor]
	33	elects to include this software in this distribution under the [CDDL or GPL
	34	Version 2] license." If you don't indicate a single choice of license, a
	35	recipient has the option to distribute your version of this file under
	36	either the CDDL, the GPL Version 2 or to extend the choice of license to
	37	its licensees as provided above. However, if you add GPL Version 2 code
	38	and therefore, elected the GPL Version 2 license, then the option applies
	39	only if the new code is made subject to such option by the copyright
	40	holder.
	41
	42	-->
	43
1	44	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2	45	<parent>
3	46	<artifactId>jaxb-api-parent</artifactId>
4	47	<groupId>javax.xml.bind</groupId>
5		<version>2.3.0</version>
	48	<version>2.3.1</version>
6	49	</parent>
7	50	<modelVersion>4.0.0</modelVersion>
8	51

20	63	<artifactId>jaxb-api</artifactId>
21	64	<version>${project.version}</version>
22	65	</dependency>
	66	<dependency>
	67	<groupId>javax.activation</groupId>
	68	<artifactId>javax.activation-api</artifactId>
	69	</dependency>
23	70	</dependencies>
24	71
25	72	<build>
26	73	<plugins>
27	74	<plugin>
28		<groupId>org.apache.maven.plugins</groupId>
	75	<artifactId>maven-compiler-plugin</artifactId>
	76	<configuration>
	77	<release>9</release>
	78	</configuration>
	79	</plugin>
	80	<plugin>
29	81	<artifactId>maven-deploy-plugin</artifactId>
30	82	<configuration>
31	83	<skip>true</skip>
32	84	</configuration>
33	85	</plugin>
34	86	<plugin>
35		<groupId>org.apache.maven.plugins</groupId>
36	87	<artifactId>maven-source-plugin</artifactId>
37		<version>3.0.1</version>
38	88	<configuration>
39	89	<skip>true</skip>
40	90	</configuration>
41	91	</plugin>
42	92	<plugin>
43		<groupId>org.apache.maven.plugins</groupId>
44	93	<artifactId>maven-javadoc-plugin</artifactId>
45	94	<configuration>
46	95	<skip>true</skip>
47	96	</configuration>
48	97	</plugin>
49	98	<plugin>
50		<groupId>org.apache.maven.plugins</groupId>
51	99	<artifactId>maven-dependency-plugin</artifactId>
52		<version>3.0.0</version>
53	100	<executions>
54	101	<execution>
55		<!--Need to copy jaxb-api jar to use it at upgrade module path as multi-release jar file -->
56	102	<id>copy</id>
57	103	<phase>test-compile</phase>
58	104	<goals>

65	111	<artifactId>jaxb-api</artifactId>
66	112	<version>${project.version}</version>
67	113	<overWrite>true</overWrite>
68		<outputDirectory>${project.build.directory}</outputDirectory>
	114	<outputDirectory>${project.build.directory}/mods</outputDirectory>
	115	</artifactItem>
	116	<artifactItem>
	117	<groupId>javax.activation</groupId>
	118	<artifactId>javax.activation-api</artifactId>
	119	<version>${activation.version}</version>
	120	<overWrite>true</overWrite>
	121	<outputDirectory>${project.build.directory}/mods</outputDirectory>
69	122	</artifactItem>
70	123	</artifactItems>
71	124	</configuration>
72	125	</execution>
73	126	</executions>
74	127	</plugin>
	128	<plugin>
	129	<artifactId>maven-surefire-plugin</artifactId>
	130	<configuration>
	131	<argLine>
	132	--add-modules java.xml.bind
	133	--upgrade-module-path ${project.build.directory}/mods/jaxb-api-${project.version}.jar
	134	--module-path ${project.build.directory}/mods/javax.activation-api-${activation.version}.jar
	135	--add-reads java.xml.bind=ALL-UNNAMED
	136	</argLine>
	137	<systemPropertyVariables>
	138	<java.util.logging.config.file>
	139	src/test/resources/logging.properties
	140	</java.util.logging.config.file>
	141	</systemPropertyVariables>
	142	</configuration>
	143	</plugin>
75	144	</plugins>
76	145	</build>
77	146
78		<profiles>
79		<profile>
80		<id>non-jdk9</id>
81		<activation>
82		<jdk>(,1.9)</jdk>
83		</activation>
84		<build>
85		<plugins>
86		<plugin>
87		<groupId>org.apache.maven.plugins</groupId>
88		<artifactId>maven-surefire-plugin</artifactId>
89		<configuration>
90		<argLine>
91		-Xbootclasspath/p:${project.build.directory}/jaxb-api-${project.version}.jar
92		</argLine>
93		<systemPropertyVariables>
94		<java.util.logging.config.file>
95		src/test/resources/logging.properties
96		</java.util.logging.config.file>
97		</systemPropertyVariables>
98		</configuration>
99		</plugin>
100		</plugins>
101		</build>
102		</profile>
103		<profile>
104		<id>jdk9</id>
105		<activation>
106		<jdk>9</jdk>
107		</activation>
108		<build>
109		<plugins>
110		<plugin>
111		<groupId>org.apache.maven.plugins</groupId>
112		<artifactId>maven-surefire-plugin</artifactId>
113		<configuration>
114		<argLine>
115		--add-modules java.xml.bind
116		--upgrade-module-path ${project.build.directory}/jaxb-api-${project.version}.jar
117		--add-reads java.xml.bind=ALL-UNNAMED
118		</argLine>
119		<systemPropertyVariables>
120		<java.util.logging.config.file>
121		src/test/resources/logging.properties
122		</java.util.logging.config.file>
123		</systemPropertyVariables>
124		</configuration>
125		</plugin>
126		</plugins>
127		</build>
128		</profile>
129		</profiles>
130	147
131		</project>⏎
	148	</project>

+44

-0

jaxb-api-test/src/main/java/module-info.java less more

	0	/*
	1	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	2	*
	3	* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
	4	*
	5	* The contents of this file are subject to the terms of either the GNU
	6	* General Public License Version 2 only ("GPL") or the Common Development
	7	* and Distribution License("CDDL") (collectively, the "License"). You
	8	* may not use this file except in compliance with the License. You can
	9	* obtain a copy of the License at
	10	* https://oss.oracle.com/licenses/CDDL+GPL-1.1
	11	* or LICENSE.txt. See the License for the specific
	12	* language governing permissions and limitations under the License.
	13	*
	14	* When distributing the software, include this License Header Notice in each
	15	* file and include the License file at LICENSE.txt.
	16	*
	17	* GPL Classpath Exception:
	18	* Oracle designates this particular file as subject to the "Classpath"
	19	* exception as provided by Oracle in the GPL Version 2 section of the License
	20	* file that accompanied this code.
	21	*
	22	* Modifications:
	23	* If applicable, add the following below the License Header, with the fields
	24	* enclosed by brackets [] replaced by your own identifying information:
	25	* "Portions Copyright [year] [name of copyright owner]"
	26	*
	27	* Contributor(s):
	28	* If you wish your version of this file to be governed by only the CDDL or
	29	* only the GPL Version 2, indicate your decision by adding "[Contributor]
	30	* elects to include this software in this distribution under the [CDDL or GPL
	31	* Version 2] license." If you don't indicate a single choice of license, a
	32	* recipient has the option to distribute your version of this file under
	33	* either the CDDL, the GPL Version 2 or to extend the choice of license to
	34	* its licensees as provided above. However, if you add GPL Version 2 code
	35	* and therefore, elected the GPL Version 2 license, then the option applies
	36	* only if the new code is made subject to such option by the copyright
	37	* holder.
	38	*/
	39
	40	/**
	41	* Placeholder for
	42	*/
	43	module java.xml.bind.tests.src {}⏎

-1

jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java less more

0	0	/*
1	1	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2	2	*
3		* Copyright (c) 2015-2017 Oracle and/or its affiliates. All rights reserved.
	3	* Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
4	4	*
5	5	* The contents of this file are subject to the terms of either the GNU
6	6	* General Public License Version 2 only ("GPL") or the Common Development

+48

-0

jaxb-api-test/src/test/java/module-info.java less more

	0	/*
	1	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	2	*
	3	* Copyright (c) 2018-2018 Oracle and/or its affiliates. All rights reserved.
	4	*
	5	* The contents of this file are subject to the terms of either the GNU
	6	* General Public License Version 2 only ("GPL") or the Common Development
	7	* and Distribution License("CDDL") (collectively, the "License"). You
	8	* may not use this file except in compliance with the License. You can
	9	* obtain a copy of the License at
	10	* https://oss.oracle.com/licenses/CDDL+GPL-1.1
	11	* or LICENSE.txt. See the License for the specific
	12	* language governing permissions and limitations under the License.
	13	*
	14	* When distributing the software, include this License Header Notice in each
	15	* file and include the License file at LICENSE.txt.
	16	*
	17	* GPL Classpath Exception:
	18	* Oracle designates this particular file as subject to the "Classpath"
	19	* exception as provided by Oracle in the GPL Version 2 section of the License
	20	* file that accompanied this code.
	21	*
	22	* Modifications:
	23	* If applicable, add the following below the License Header, with the fields
	24	* enclosed by brackets [] replaced by your own identifying information:
	25	* "Portions Copyright [year] [name of copyright owner]"
	26	*
	27	* Contributor(s):
	28	* If you wish your version of this file to be governed by only the CDDL or
	29	* only the GPL Version 2, indicate your decision by adding "[Contributor]
	30	* elects to include this software in this distribution under the [CDDL or GPL
	31	* Version 2] license." If you don't indicate a single choice of license, a
	32	* recipient has the option to distribute your version of this file under
	33	* either the CDDL, the GPL Version 2 or to extend the choice of license to
	34	* its licensees as provided above. However, if you add GPL Version 2 code
	35	* and therefore, elected the GPL Version 2 license, then the option applies
	36	* only if the new code is made subject to such option by the copyright
	37	* holder.
	38	*/
	39
	40	/**
	41	* Tests for jaxb API.
	42	*/
	43	module java.xml.bind.tests {
	44	requires java.xml.bind;
	45	requires java.logging;
	46	requires junit;
	47	}⏎

+74

-8

pom.xml less more

2	2
3	3	DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4	4
5		Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
	5	Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
6	6
7	7	The contents of this file are subject to the terms of either the GNU
8	8	General Public License Version 2 only ("GPL") or the Common Development

42	42
43	43	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44	44
	45	<modelVersion>4.0.0</modelVersion>
	46	<groupId>javax.xml.bind</groupId>
	47	<artifactId>jaxb-api-parent</artifactId>
	48	<version>2.3.1</version>
	49
45	50	<parent>
46	51	<groupId>net.java</groupId>
47	52	<artifactId>jvnet-parent</artifactId>
48	53	<version>5</version>
49	54	</parent>
50	55
51		<modelVersion>4.0.0</modelVersion>
52		<groupId>javax.xml.bind</groupId>
53		<artifactId>jaxb-api-parent</artifactId>
54		<version>2.3.0</version>
55	56	<modules>
56	57	<module>jaxb-api</module>
57	58	<module>jaxb-api-test</module>

71	72	<connection>scm:git:git://github.com/javaee/jaxb-spec.git</connection>
72	73	<developerConnection>scm:git:git@github.com:javaee/jaxb-spec.git</developerConnection>
73	74	<url>https://github.com/javaee/jaxb-spec.git</url>
74		<tag>2.3.0</tag>
	75	<tag>HEAD</tag>
75	76	</scm>
76	77
77	78	<developers>

120	121	<extension.name>javax.xml.bind</extension.name>
121	122	<spec.version>2.3</spec.version>
122	123	<impl.version>0</impl.version>
	124	<activation.version>1.2.0</activation.version>
123	125	</properties>
	126
	127	<dependencyManagement>
	128	<dependencies>
	129	<dependency>
	130	<groupId>javax.activation</groupId>
	131	<artifactId>javax.activation-api</artifactId>
	132	<version>${activation.version}</version>
	133	</dependency>
	134	</dependencies>
	135	</dependencyManagement>
124	136
125	137
126	138	<build>
127	139	<pluginManagement>
128	140	<plugins>
129	141	<plugin>
130		<groupId>org.apache.maven.plugins</groupId>
131	142	<artifactId>maven-compiler-plugin</artifactId>
132		<version>3.6.0</version>
	143	<version>3.7.0</version>
133	144	<configuration>
134	145	<source>1.7</source>
135	146	<target>1.7</target>

138	149	</compilerArgs>
139	150	</configuration>
140	151	</plugin>
	152	<plugin>
	153	<artifactId>maven-surefire-plugin</artifactId>
	154	<version>2.20</version>
	155	</plugin>
	156	<plugin>
	157	<artifactId>maven-release-plugin</artifactId>
	158	<version>2.5.3</version>
	159	</plugin>
	160	<plugin>
	161	<artifactId>maven-javadoc-plugin</artifactId>
	162	<version>3.0.1</version>
	163	</plugin>
	164	<plugin>
	165	<artifactId>maven-enforcer-plugin</artifactId>
	166	<version>3.0.0-M2</version>
	167	</plugin>
	168	<plugin>
	169	<artifactId>maven-source-plugin</artifactId>
	170	<version>3.0.1</version>
	171	</plugin>
	172	<plugin>
	173	<artifactId>maven-deploy-plugin</artifactId>
	174	<version>2.8.2</version>
	175	</plugin>
	176	<plugin>
	177	<artifactId>maven-dependency-plugin</artifactId>
	178	<version>3.1.1</version>
	179	</plugin>
	180	<plugin>
	181	<artifactId>maven-gpg-plugin</artifactId>
	182	<version>1.6</version>
	183	</plugin>
141	184	</plugins>
142	185	</pluginManagement>
143	186
144	187	</build>
145	188
	189	<profiles>
	190	<profile>
	191	<id>jvnet-release</id>
	192	<build>
	193	<plugins>
	194	<plugin>
	195	<groupId>org.apache.maven.plugins</groupId>
	196	<artifactId>maven-javadoc-plugin</artifactId>
	197	<configuration>
	198	<additionalJOptions>
	199	<additionalJOption>-Xdoclint:none</additionalJOption>
	200	</additionalJOptions>
	201	</configuration>
	202	</plugin>
	203	<plugin>
	204	<groupId>org.apache.maven.plugins</groupId>
	205	<artifactId>maven-enforcer-plugin</artifactId>
	206	</plugin>
	207	</plugins>
	208	</build>
	209	</profile>
	210	</profiles>
	211
146	212	</project>

+70

-14

tools/rewrite_poms_git.sh less more

0	0	#!/bin/bash
	1	#
	2	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
	3	#
	4	# Copyright (c) 2017-2018 Oracle and/or its affiliates. All rights reserved.
	5	#
	6	# The contents of this file are subject to the terms of either the GNU
	7	# General Public License Version 2 only ("GPL") or the Common Development
	8	# and Distribution License("CDDL") (collectively, the "License"). You
	9	# may not use this file except in compliance with the License. You can
	10	# obtain a copy of the License at
	11	# https://oss.oracle.com/licenses/CDDL+GPL-1.1
	12	# or LICENSE.txt. See the License for the specific
	13	# language governing permissions and limitations under the License.
	14	#
	15	# When distributing the software, include this License Header Notice in each
	16	# file and include the License file at LICENSE.txt.
	17	#
	18	# GPL Classpath Exception:
	19	# Oracle designates this particular file as subject to the "Classpath"
	20	# exception as provided by Oracle in the GPL Version 2 section of the License
	21	# file that accompanied this code.
	22	#
	23	# Modifications:
	24	# If applicable, add the following below the License Header, with the fields
	25	# enclosed by brackets [] replaced by your own identifying information:
	26	# "Portions Copyright [year] [name of copyright owner]"
	27	#
	28	# Contributor(s):
	29	# If you wish your version of this file to be governed by only the CDDL or
	30	# only the GPL Version 2, indicate your decision by adding "[Contributor]
	31	# elects to include this software in this distribution under the [CDDL or GPL
	32	# Version 2] license." If you don't indicate a single choice of license, a
	33	# recipient has the option to distribute your version of this file under
	34	# either the CDDL, the GPL Version 2 or to extend the choice of license to
	35	# its licensees as provided above. However, if you add GPL Version 2 code
	36	# and therefore, elected the GPL Version 2 license, then the option applies
	37	# only if the new code is made subject to such option by the copyright
	38	# holder.
	39	#
	40
1	41
2	42	# if option -n ... do not commit
3	43	COMMIT=Y
4		while getopts ":n" opt; do
	44	RELEASE=false
	45
	46	while getopts ":nv:r" opt; do
5	47	case $opt in
6	48	n)
7	49	COMMIT=N
8		shift
	50	;;
	51	v)
	52	CUSTOM_VERSION=${OPTARG}
	53	echo "Using custom version: ${CUSTOM_VERSION}"
	54	;;
	55	r)
	56	RELEASE=true
	57	echo "Using release mode, to append buildnumber remove -r flag."
9	58	;;
10	59	\?)
11	60	echo "Invalid option: -$OPTARG" >&2

15	64	done
16	65	echo "Script will commit changes: [$COMMIT] (pass option -n not to commit)"
17	66
18		#if [ "$#" -eq 1 ]; then
19		# CURRENT_VERSION=$1
20		#fi
21		#
22		#if [ "$#" -eq 0 ]; then
23		# echo "No version specified, reading release version from pom file"
24		# CURRENT_VERSION=`cat pom.xml \| grep '<version' -m 1 \| cut -d ">" -f 2 \| cut -d "<" -f 1 \| cut -d "-" -f 1`
25		#fi
26		CURRENT_VERSION=2.3.0
27
28		echo "Major release version found: $CURRENT_VERSION"
	67	CURRENT_VERSION=`cat pom.xml \| grep '<version' -m 1 \| cut -d ">" -f 2 \| cut -d "<" -f 1 \| cut -d "-" -f 1`
	68	echo "Current version: ${CURRENT_VERSION}"
29	69
30	70	SCRIPT_DIR=$(cd $(dirname $0); pwd -P)
31	71

47	87	BUILD_NUMBER=b${DATESTAMP}
48	88	DEVELOPER_VERSION=${CURRENT_VERSION}-SNAPSHOT
49	89	RELEASE_QUALIFIER=${BUILD_NUMBER}
50		RELEASE_VERSION=${CURRENT_VERSION}-${RELEASE_QUALIFIER}
	90
	91	if [ -z "${CUSTOM_VERSION}" ]; then
	92	echo "No version specified, reading release version from pom file"
	93	RELEASE_VERSION=${CURRENT_VERSION}
	94	else
	95	RELEASE_VERSION=${CUSTOM_VERSION}
	96	fi;
	97
	98	if [ "${RELEASE}" = true ]; then
	99	echo "Release version: ${RELEASE_VERSION}"
	100	else
	101	RELEASE_VERSION="${RELEASE_VERSION}-${RELEASE_QUALIFIER}"
	102	echo "Pre-release version: ${RELEASE_VERSION}"
	103	fi;
	104
	105
	106
51	107	RELEASE_TAG=${RELEASE_VERSION}
52	108
53	109	cleanup()