Import upstream version 2.4.0
Debian Janitor
2 years ago
0 | |
/target/
|
1 | |
/jaxb-api/target/⏎
|
|
0 |
/target/⏎
|
45 | 45 |
<parent>
|
46 | 46 |
<artifactId>jaxb-api-parent</artifactId>
|
47 | 47 |
<groupId>javax.xml.bind</groupId>
|
48 | |
<version>2.3.1</version>
|
|
48 |
<version>2.4.0</version>
|
49 | 49 |
</parent>
|
50 | 50 |
<modelVersion>4.0.0</modelVersion>
|
51 | 51 |
|
|
170 | 170 |
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
171 | 171 |
</archive>
|
172 | 172 |
<instructions>
|
173 | |
<Require-Capability>osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.8))"</Require-Capability>
|
174 | 173 |
<Bundle-Version>${project.version}</Bundle-Version> <!-- 2.2.99.bnull -->
|
175 | 174 |
<Extension-Name>${extension.name}</Extension-Name>
|
176 | 175 |
<Implementation-Version>${spec.version}.${impl.version}</Implementation-Version>
|
69 | 69 |
class ContextFinder {
|
70 | 70 |
|
71 | 71 |
/**
|
72 | |
* When JAXB is in J2SE, rt.jar has to have a JAXB implementation.
|
73 | |
* However, rt.jar cannot have META-INF/services/javax.xml.bind.JAXBContext
|
74 | |
* because if it has, it will take precedence over any file that applications have
|
75 | |
* in their jar files.
|
76 | |
*
|
77 | |
* <p>
|
78 | |
* When the user bundles his own JAXB implementation, we'd like to use it, and we
|
79 | |
* want the platform default to be used only when there's no other JAXB provider.
|
80 | |
*
|
81 | |
* <p>
|
82 | |
* For this reason, we have to hard-code the class name into the API.
|
83 | |
*/
|
84 | |
private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory";
|
|
72 |
* Previously used to point into JavaSE provider now defaults to RI context factory class.
|
|
73 |
* This will be used as the last resort if none of other resolution mechanism is successful.
|
|
74 |
*/
|
|
75 |
private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.bind.v2.ContextFactory";
|
85 | 76 |
|
86 | 77 |
// previous value of JAXBContext.JAXB_CONTEXT_FACTORY, using also this to ensure backwards compatibility
|
87 | 78 |
private static final String JAXB_CONTEXT_FACTORY_DEPRECATED = "javax.xml.bind.context.factory";
|
45 | 45 |
<parent>
|
46 | 46 |
<artifactId>jaxb-api-parent</artifactId>
|
47 | 47 |
<groupId>javax.xml.bind</groupId>
|
48 | |
<version>2.3.1</version>
|
|
48 |
<version>2.4.0</version>
|
49 | 49 |
</parent>
|
50 | 50 |
<modelVersion>4.0.0</modelVersion>
|
51 | 51 |
|
81 | 81 |
private static final String FACTORY_ID = "javax.xml.bind.JAXBContextFactory";
|
82 | 82 |
private static final String PACKAGE_LEGACY = "jaxb.factory.legacy."; // TODO: ???
|
83 | 83 |
private static final String PACKAGE_SPI = "jaxb.factory.spi."; // TODO: ???
|
84 | |
private static final Object DEFAULT = "com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl";
|
|
84 |
private static final Object DEFAULT = "com.sun.xml.bind.v2.runtime.JAXBContextImpl";
|
85 | 85 |
|
86 | 86 |
|
87 | 87 |
static {
|
45 | 45 |
<modelVersion>4.0.0</modelVersion>
|
46 | 46 |
<groupId>javax.xml.bind</groupId>
|
47 | 47 |
<artifactId>jaxb-api-parent</artifactId>
|
48 | |
<version>2.3.1</version>
|
|
48 |
<version>2.4.0</version>
|
49 | 49 |
|
50 | 50 |
<parent>
|
51 | 51 |
<groupId>net.java</groupId>
|