Skip to content

GitLab

Unverified Commit 09a4e905 authored by Thibault Vallin's avatar Thibault Vallin Committed by GitHub
Browse files

Rename package from javax to jakarta (#125) 


* Rename package from javax to jakarta
Signed-off-by: default avatartvallin <thibault.vallin@oracle.com>
parent 53e61ae7
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 101 deletions
etc/config/copyright-exclude
View file @ 09a4e905
......@@ -6,6 +6,6 @@
etc/config/copyright-exclude
javadoc/doc-files/speclicense.html
jaxb-api-test/src/test/resources/logging.properties
jaxb-api-test/src/test/resources/javax/xml/bind/test.policy
jaxb-api-test/src/test/resources/jakarta/xml/bind/test.policy
jaxb-api-test/src/test/resources/jaxb/test/usr/jaxb.index
/LICENSE.md
jaxb-api-test/src/main/java/module-info.java
View file @ 09a4e905
/*
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -11,4 +11,4 @@
/**
* Placeholder for
*/
module java.xml.bind.tests.src {}
module jakarta.xml.bind.tests.src {}
jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextServiceProviderNPETest.java → jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,12 +8,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind.test;
package jakarta.xml.bind.test;
import org.junit.Before;
import org.junit.Test;
import javax.xml.bind.*;
import jakarta.xml.bind.*;
import java.util.Map;
import static junit.framework.Assert.assertEquals;
......@@ -83,7 +83,7 @@ public class JAXBContextServiceProviderNPETest {
@Before
public void setup() {
System.setProperty("javax.xml.bind.JAXBContextFactory", "javax.xml.bind.test.JAXBContextServiceProviderNPETest$Factory");
System.setProperty("jakarta.xml.bind.JAXBContextFactory", "jakarta.xml.bind.test.JAXBContextServiceProviderNPETest$Factory");
}
public static void main(String[] args) throws JAXBException {
......@@ -94,3 +94,4 @@ public class JAXBContextServiceProviderNPETest {
}
}
jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java → jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
View file @ 09a4e905
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind.test;
package jakarta.xml.bind.test;
import jaxb.test.usr.A;
......@@ -17,7 +17,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import javax.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBContext;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
......@@ -48,8 +48,8 @@ public class JAXBContextTest {
// test-classes directory (required for setup and for security settings)
static final String classesDir = JAXBContextTest.class.getProtectionDomain().getCodeSource().getLocation().getFile();
private static final String FACTORY_ID_LEGACY = "javax.xml.bind.context.factory";
private static final String FACTORY_ID = "javax.xml.bind.JAXBContextFactory";
private static final String FACTORY_ID_LEGACY = "jakarta.xml.bind.context.factory";
private static final String FACTORY_ID = "jakarta.xml.bind.JAXBContextFactory";
private static final String PACKAGE_LEGACY = "jaxb.factory.legacy."; // TODO: ???
private static final String PACKAGE_SPI = "jaxb.factory.spi."; // TODO: ???
private static final Object DEFAULT = "com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl";
......@@ -61,8 +61,8 @@ public class JAXBContextTest {
// configuration to be created by the test
static Path providersDir = Paths.get(classesDir, "META-INF", "services");
static Path providersFileLegacy = providersDir.resolve("javax.xml.bind.JAXBContext");
static Path providersFile = providersDir.resolve("javax.xml.bind.JAXBContextFactory");
static Path providersFileLegacy = providersDir.resolve("jakarta.xml.bind.JAXBContext");
static Path providersFile = providersDir.resolve("jakarta.xml.bind.JAXBContextFactory");
// configuration to be created by the test
static Path jaxbPropsDir = Paths.get(classesDir, "jaxb", "test", "usr");
......@@ -83,59 +83,59 @@ public class JAXBContextTest {
return Arrays.asList(new Object[][]{
// scenario-name, jaxb.properties, svc, arg1, arg2, system-props
{"scenario-1", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Valid", null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
{"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Invalid", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-13", FACTORY_ID_LEGACY + "="+PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid3"},
{"scenario-1", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Valid", null, PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Invalid", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-3", FACTORY_ID_LEGACY + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-13", FACTORY_ID_LEGACY + "="+PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid3"},
{"scenario-1", FACTORY_ID + "="+PACKAGE_SPI+"Valid", null, PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID + "="+PACKAGE_SPI+"Invalid", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID + "="+PACKAGE_SPI+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-13", FACTORY_ID + "="+PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid3"},
{"scenario-1", FACTORY_ID + "="+PACKAGE_LEGACY+"Valid", null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
{"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID + "="+PACKAGE_LEGACY+"Invalid", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-3", FACTORY_ID + "=non.existing.FactoryClass", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-4", FACTORY_ID + "="+PACKAGE_LEGACY+"Invalid", null, null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-13", FACTORY_ID + "="+PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid3"},
{"scenario-2", "something=AnotherThing", null, null, javax.xml.bind.JAXBException.class, null},
{"scenario-2", "something=AnotherThing", null, null, jakarta.xml.bind.JAXBException.class, null},
// service loader
{"scenario-8", null, PACKAGE_SPI+"Valid\n", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-9", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-11", null, PACKAGE_SPI+"Invalid", null, javax.xml.bind.JAXBException.class, null},
{"scenario-11", null, PACKAGE_SPI+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-15", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
// service loader - legacy
{"scenario-8 legacy-svc", null, PACKAGE_SPI+"Valid\n", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-9 legacy-svc", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
{"scenario-11 legacy-svc", null, PACKAGE_SPI+"Invalid", null, javax.xml.bind.JAXBException.class, null},
{"scenario-11 legacy-svc", null, PACKAGE_SPI+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-15 legacy-svc", null, PACKAGE_SPI+"Valid", PACKAGE_SPI+"Valid$JAXBContext1", null, null},
// service loader - legacy
{"scenario-8 legacy-svc", null, PACKAGE_LEGACY+"Valid\n", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
{"scenario-9 legacy-svc", null, PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
{"scenario-11 legacy-svc", null, PACKAGE_LEGACY+"Invalid", null, javax.xml.bind.JAXBException.class, null},
{"scenario-11 legacy-svc", null, PACKAGE_LEGACY+"Invalid", null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-15 legacy-svc", null, PACKAGE_LEGACY+"Valid", PACKAGE_LEGACY+"Valid$JAXBContext1", null, null},
// system property
{"scenario-5", null, null, PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid"},
{"scenario-7", null, null, null, javax.xml.bind.JAXBException.class, PACKAGE_SPI+"Invalid"},
{"scenario-7", null, null, null, jakarta.xml.bind.JAXBException.class, PACKAGE_SPI+"Invalid"},
{"scenario-14", null, PACKAGE_SPI+"Valid2", PACKAGE_SPI+"Valid$JAXBContext1", null, PACKAGE_SPI+"Valid"},
{"scenario-5", null, null, PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid"},
{"scenario-7", null, null, null, javax.xml.bind.JAXBException.class, PACKAGE_LEGACY+"Invalid"},
{"scenario-7", null, null, null, jakarta.xml.bind.JAXBException.class, PACKAGE_LEGACY+"Invalid"},
{"scenario-14", null, PACKAGE_LEGACY+"Valid2", PACKAGE_LEGACY+"Valid$JAXBContext1", null, PACKAGE_LEGACY+"Valid"},
{"scenario-6", null, null, null, javax.xml.bind.JAXBException.class, "jaxb.factory.NonExisting"},
{"scenario-6", null, null, null, jakarta.xml.bind.JAXBException.class, "jaxb.factory.NonExisting"},
{"scenario-10", null, "jaxb.factory.NonExisting", null, javax.xml.bind.JAXBException.class, null},
{"scenario-10", null, "jaxb.factory.NonExisting", null, jakarta.xml.bind.JAXBException.class, null},
{"scenario-12", null, null, DEFAULT, javax.xml.bind.JAXBException.class, null},
{"scenario-12", null, null, DEFAULT, jakarta.xml.bind.JAXBException.class, null},
});
}
......@@ -153,9 +153,9 @@ public class JAXBContextTest {
System.setSecurityManager(null);
if (systemProperty != null) {
System.setProperty("javax.xml.bind.JAXBContextFactory", systemProperty);
System.setProperty("jakarta.xml.bind.JAXBContextFactory", systemProperty);
} else {
System.clearProperty("javax.xml.bind.JAXBContextFactory");
System.clearProperty("jakarta.xml.bind.JAXBContextFactory");
}
this.scenario = scenario;
......@@ -264,7 +264,7 @@ public class JAXBContextTest {
private void enableSM() {
System.setSecurityManager(null);
System.setProperty("java.security.policy", classesDir + "javax/xml/bind/test.policy");
System.setProperty("java.security.policy", classesDir + "jakarta/xml/bind/test.policy");
System.setSecurityManager(new SecurityManager());
}
......@@ -341,3 +341,4 @@ public class JAXBContextTest {
}
jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextWrapExceptionTest.java → jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,13 +8,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind.test;
package jakarta.xml.bind.test;
import org.junit.Before;
import org.junit.Test;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import java.util.Map;
import static junit.framework.Assert.assertEquals;
......@@ -63,7 +63,7 @@ public class JAXBContextWrapExceptionTest {
@Before
public void setup() {
System.setProperty("javax.xml.bind.JAXBContextFactory", "javax.xml.bind.test.JAXBContextWrapExceptionTest$Factory");
System.setProperty("jakarta.xml.bind.JAXBContextFactory", "jakarta.xml.bind.test.JAXBContextWrapExceptionTest$Factory");
}
public static void main(String[] args) throws JAXBException {
......@@ -72,3 +72,4 @@ public class JAXBContextWrapExceptionTest {
}
}
jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,11 +10,11 @@
package jaxb.factory.legacy;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,11 +10,11 @@
package jaxb.factory.legacy;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,11 +10,11 @@
package jaxb.factory.legacy;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,12 +10,12 @@
package jaxb.factory.spi;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBContextFactory;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBContextFactory;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,12 +10,12 @@
package jaxb.factory.spi;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBContextFactory;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBContextFactory;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,12 +10,12 @@
package jaxb.factory.spi;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBContextFactory;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.Validator;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBContextFactory;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.Validator;
import java.util.Map;
/**
......
jaxb-api-test/src/test/java/jaxb/test/usr/A.java
View file @ 09a4e905
/*
* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -10,8 +10,8 @@
package jaxb.test.usr;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
/**
* Simple user class for testing creation of JAXBContext
......
jaxb-api-test/src/test/java/module-info.java
View file @ 09a4e905
/*
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -11,7 +11,7 @@
/**
* Tests for jaxb API.
*/
module java.xml.bind.tests {
module jakarta.xml.bind.tests {
requires java.xml.bind;
requires java.logging;
requires junit;
......
jaxb-api/src/main/java/javax/xml/bind/Binder.java → jaxb-api/src/main/java/jakarta/xml/bind/Binder.java
View file @ 09a4e905
/*
* Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
import org.w3c.dom.Node;
......
jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java → jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java
View file @ 09a4e905
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
import java.io.BufferedReader;
import java.io.IOException;
......@@ -39,12 +39,12 @@ import java.util.logging.Logger;
class ContextFinder {
// previous value of JAXBContext.JAXB_CONTEXT_FACTORY, using also this to ensure backwards compatibility
private static final String JAXB_CONTEXT_FACTORY_DEPRECATED = "javax.xml.bind.context.factory";
private static final String JAXB_CONTEXT_FACTORY_DEPRECATED = "jakarta.xml.bind.context.factory";
private static final Logger logger;
static {
logger = Logger.getLogger("javax.xml.bind");
logger = Logger.getLogger("jakarta.xml.bind");
try {
if (AccessController.doPrivileged(new GetPropertyAction("jaxb.debug")) != null) {
// disconnect the logger from a bigger framework (if any)
......@@ -111,7 +111,7 @@ class ContextFinder {
return new JAXBException(Messages.format(Messages.ILLEGAL_CAST,
// we don't care where the impl class is, we want to know where JAXBContext lives in the impl
// class' ClassLoader
getClassClassLoader(originalType).getResource("javax/xml/bind/JAXBContext.class"),
getClassClassLoader(originalType).getResource("jakarta/xml/bind/JAXBContext.class"),
targetTypeURL));
}
......@@ -155,7 +155,7 @@ class ContextFinder {
ModuleUtil.delegateAddOpensToImplModule(contextPathClasses, spFactory);
/*
* javax.xml.bind.context.factory points to a class which has a
* jakarta.xml.bind.context.factory points to a class which has a
* static method called 'createContext' that
* returns a javax.xml.JAXBContext.
*/
......@@ -307,7 +307,7 @@ class ContextFinder {
if (factoryName != null) return newInstance(contextPath, contextPathClasses, factoryName, classLoader, properties);
Class ctxFactory = (Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader(
"javax.xml.bind.JAXBContext", logger);
"jakarta.xml.bind.JAXBContext", logger);
if (ctxFactory != null) {
return newInstance(contextPath, contextPathClasses, ctxFactory, classLoader, properties);
......@@ -364,7 +364,7 @@ class ContextFinder {
logger.fine("Trying to create the platform default provider");
Class ctxFactoryClass =
(Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext", logger);
(Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader("jakarta.xml.bind.JAXBContext", logger);
if (ctxFactoryClass != null) {
return newInstance(classes, properties, ctxFactoryClass);
......
jaxb-api/src/main/java/javax/xml/bind/DataBindingException.java → jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
View file @ 09a4e905
/*
* Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
/**
* Exception that represents a failure in a JAXB operation.
......
jaxb-api/src/main/java/javax/xml/bind/DatatypeConverter.java → jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
View file @ 09a4e905
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
import javax.xml.namespace.NamespaceContext;
......
jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterImpl.java → jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
View file @ 09a4e905
/*
* Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
import java.math.BigDecimal;
import java.math.BigInteger;
......
jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterInterface.java → jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
View file @ 09a4e905
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
......@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
package javax.xml.bind;
package jakarta.xml.bind;
/**
* <p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Powered by Integricloud