diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
index 5f02897ecd43f0c4eec1f0ce07e65ee10a98dc0b..b8578b65c685c3fe620d061ef3f54f760a14ccda 100644
--- a/etc/config/copyright-exclude
+++ b/etc/config/copyright-exclude
@@ -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
diff --git a/jaxb-api-test/src/main/java/module-info.java b/jaxb-api-test/src/main/java/module-info.java
index 91f7b9679c9635edb7a6e451dedf52d8e1e8c06b..f6add3ef03070c4687aa17c67b957a6ff48ef408 100644
--- a/jaxb-api-test/src/main/java/module-info.java
+++ b/jaxb-api-test/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * 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 {}
diff --git a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextServiceProviderNPETest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
similarity index 91%
rename from jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextServiceProviderNPETest.java
rename to jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
index 8538000d5bf487be90f93824d9f5653b9090aed3..56de60c4d1aad530f0ee79f1fef1c62ee66d5016 100644
--- a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextServiceProviderNPETest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextServiceProviderNPETest.java
@@ -1,5 +1,5 @@
/*
- * 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 {
}
}
+
diff --git a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
similarity index 86%
rename from jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java
rename to jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
index 4d134f6a6051b5392856d7074c64bde19f895236..2b5ed2903186ad7d59a0bf1a4951c0a0c0d35d31 100644
--- a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextTest.java
@@ -1,5 +1,5 @@
/*
- * 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 {
}
+
diff --git a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextWrapExceptionTest.java b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
similarity index 86%
rename from jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextWrapExceptionTest.java
rename to jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
index 56c31d19d433e32bee480981caca242f6586aeb7..f312f1a858405daa1a008c6172f4af7ee568d6c1 100644
--- a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextWrapExceptionTest.java
+++ b/jaxb-api-test/src/test/java/jakarta/xml/bind/test/JAXBContextWrapExceptionTest.java
@@ -1,5 +1,5 @@
/*
- * 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 {
}
}
+
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
index b23b589cf4373d6e593a88dd8f551a2424799c3e..0ab7c989167299c42aaa12cac14b46ca22ea76c3 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
index 56ce99013c89ce22a25d3dadad2f7bc37c8c18ac..a7bf2cd8fa1e0390d05731d769c89de68f93ba9f 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid2.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
index ffd041422d5b6b74158c82ddaec0630265b47422..adbd5418540fb21297e58c1de22adaf600e4e798 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/legacy/Valid3.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java
index d2b54d47f71071d8061c8b9b9474a4f9ed2a835e..dd7701867f36e6463906e9962a27951d031cd042 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java
index 1513e936f255c4906074b4abb2514d1985d69539..d9b728acb5cfba9788f01eb3d7dcb3340189f053 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid2.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java
index 93c943671a321c5f84cfe3942d3642c27f45c8a6..abe6a76989a6364709b562a8cc607acbb52d33ba 100644
--- a/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java
+++ b/jaxb-api-test/src/test/java/jaxb/factory/spi/Valid3.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
diff --git a/jaxb-api-test/src/test/java/jaxb/test/usr/A.java b/jaxb-api-test/src/test/java/jaxb/test/usr/A.java
index 7c111e7ecef44d4b068f4bf701bf72a017c0242f..bf195780d6e89df67ecc98b5bb8fa3203332bf5f 100644
--- a/jaxb-api-test/src/test/java/jaxb/test/usr/A.java
+++ b/jaxb-api-test/src/test/java/jaxb/test/usr/A.java
@@ -1,5 +1,5 @@
/*
- * 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
diff --git a/jaxb-api-test/src/test/java/module-info.java b/jaxb-api-test/src/test/java/module-info.java
index 72311f1871e43ee17cc7388720629929cd2738b2..d6404cbdea10a8307a1ca0e94a63dda68536f8ec 100644
--- a/jaxb-api-test/src/test/java/module-info.java
+++ b/jaxb-api-test/src/test/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * 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;
diff --git a/jaxb-api-test/src/test/resources/javax/xml/bind/test.policy b/jaxb-api-test/src/test/resources/jakarta/xml/bind/test.policy
similarity index 100%
rename from jaxb-api-test/src/test/resources/javax/xml/bind/test.policy
rename to jaxb-api-test/src/test/resources/jakarta/xml/bind/test.policy
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Binder.java b/jaxb-api/src/main/java/jakarta/xml/bind/Binder.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/Binder.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Binder.java
index 7266f3cd43b91cceef7edbee0a4816505d50f67d..153d18c251c871e57fb89284d941e75cd6194c7c 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Binder.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Binder.java
@@ -1,5 +1,5 @@
/*
- * 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;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java b/jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java
index 790424c7a4c0c9e5bb77550930b2046216562640..66bee3518712575d760e54863b52193c56f6e1cd 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ContextFinder.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ContextFinder.java
@@ -1,5 +1,5 @@
/*
- * 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);
diff --git a/jaxb-api/src/main/java/javax/xml/bind/DataBindingException.java b/jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
similarity index 89%
rename from jaxb-api/src/main/java/javax/xml/bind/DataBindingException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
index 60d9a97c1661fd79651a4b08ae4bb0dae2c2310e..acd1f02d4888591f8afbef8889d50619f3ce7a9c 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/DataBindingException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/DataBindingException.java
@@ -1,5 +1,5 @@
/*
- * 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.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverter.java b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/DatatypeConverter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
index 2869de97ee1be04d374e50e0402d789ad8ac88de..c1322b2a99ac87d05aaa8052c3cb43b9f0cec121 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverter.java
@@ -1,5 +1,5 @@
/*
- * 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;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
index 1072b52840328de07e9a0f8c87ba82cc1296e241..bf73e9f122b98f1225102314b47f35a37e83f51e 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterImpl.java
@@ -1,5 +1,5 @@
/*
- * 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;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterInterface.java b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterInterface.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
index 80d661a538ecf5e8ba83ea429d6f630302cde3b1..45eb7d3c6c9c7ad7a69966a35a227e74b091c326 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/DatatypeConverterInterface.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/DatatypeConverterInterface.java
@@ -1,5 +1,5 @@
/*
- * 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>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Element.java b/jaxb-api/src/main/java/jakarta/xml/bind/Element.java
similarity index 91%
rename from jaxb-api/src/main/java/javax/xml/bind/Element.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Element.java
index d281616611082cad1860ac6199c87370e3eb3a3f..9dd6b7849814c9591fbf69e40f343f86b110c06f 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Element.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Element.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This is an element marker interface.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/GetPropertyAction.java b/jaxb-api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/GetPropertyAction.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
index 623ebd5f92784ed4a24732a69edf737f82124c20..40bd12201aedfa232e0d2f4dcbb4981584a484fe 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/GetPropertyAction.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/GetPropertyAction.java
@@ -1,5 +1,5 @@
/*
- * 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;
import java.security.PrivilegedAction;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXB.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXB.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
index 0d9e6a6bec606dac98d1f7e7adb5cd03297929fd..fb20f455d4abb61513fd4e8b67428d3bbc4c9b69 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXB.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXB.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.namespace.QName;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBContext.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBContext.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java
index f490d6cd4c341b8ab9c9f3fd285496b23c78de24..a7466b5b1f92fe541bb93ebc4c8a12375cbcb26d 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBContext.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContext.java
@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
import org.w3c.dom.Node;
@@ -48,13 +48,13 @@ import java.util.Properties;
* java interface/implementation binding. It does not apply to JAXB annotated
* classes. JAXB Providers must generate a {@code jaxb.properties} file in
* each package containing schema derived classes. The property file must
- * contain a property named {@code javax.xml.bind.context.factory} whose
+ * contain a property named {@code jakarta.xml.bind.context.factory} whose
* value is the name of the class that implements the {@code createContext}
* APIs.</i>
*
* <p><i>
* The class supplied by the provider does not have to be assignable to
- * {@code javax.xml.bind.JAXBContext}, it simply has to provide a class that
+ * {@code jakarta.xml.bind.JAXBContext}, it simply has to provide a class that
* implements the {@code createContext} APIs.</i>
*
* <p><i>
@@ -205,7 +205,7 @@ import java.util.Properties;
* <p>
* If such a resource is discovered, it is {@link Properties#load(InputStream) loaded} as a property file, and
* the value of the {@link #JAXB_CONTEXT_FACTORY} key will be assumed to be the provider factory class. If no value
- * found, {@code "javax.xml.bind.context.factory"} is used as a key for backwards compatibility reasons. This class is
+ * found, {@code "jakarta.xml.bind.context.factory"} is used as a key for backwards compatibility reasons. This class is
* then loaded by the associated class loader discussed above.
*
* <p>
@@ -217,12 +217,12 @@ import java.util.Properties;
*
* <li>
* If the system property {@link #JAXB_CONTEXT_FACTORY} exists, then its value is assumed to be the provider
- * factory class. If no such property exists, properties {@code "javax.xml.bind.context.factory"} and
- * {@code "javax.xml.bind.JAXBContext"} are checked too (in this order), for backwards compatibility reasons. This phase
+ * factory class. If no such property exists, properties {@code "jakarta.xml.bind.context.factory"} and
+ * {@code "jakarta.xml.bind.JAXBContext"} are checked too (in this order), for backwards compatibility reasons. This phase
* of the look up enables per-JVM override of the JAXB implementation.
*
* <li>
- * Provider of {@link javax.xml.bind.JAXBContextFactory} is loaded using the service-provider loading
+ * Provider of {@link jakarta.xml.bind.JAXBContextFactory} is loaded using the service-provider loading
* facilities, defined by the {@link java.util.ServiceLoader} class, to attempt
* to locate and load an implementation of the service using the {@linkplain
* java.util.ServiceLoader#load(java.lang.Class) default loading mechanism}: the service-provider loading facility
@@ -231,10 +231,10 @@ import java.util.Properties;
* {@linkplain ClassLoader#getSystemClassLoader() system class loader} will be used.
* <br>
* In case of {@link java.util.ServiceConfigurationError service
- * configuration error} a {@link javax.xml.bind.JAXBException} will be thrown.
+ * configuration error} a {@link jakarta.xml.bind.JAXBException} will be thrown.
*
* <li>
- * Look for resource {@code /META-INF/services/javax.xml.bind.JAXBContext} using provided class loader.
+ * Look for resource {@code /META-INF/services/jakarta.xml.bind.JAXBContext} using provided class loader.
* Methods without class loader parameter use {@code Thread.currentThread().getContextClassLoader()}.
* If such a resource exists, its content is assumed to be the provider factory class.
*
@@ -252,7 +252,7 @@ import java.util.Properties;
*
* For backward compatibility reasons, there are two ways how to implement provider factory class:
* <ol>
- * <li>the class is implementation of {@link javax.xml.bind.JAXBContextFactory}. It must also implement no-arg
+ * <li>the class is implementation of {@link jakarta.xml.bind.JAXBContextFactory}. It must also implement no-arg
* constructor. If discovered in other step then 3, new instance using no-arg constructor is created first.
* After that, appropriate instance method is invoked on this instance.
* <li>the class is not implementation of interface above and then it is mandated to implement the following
@@ -276,14 +276,14 @@ import java.util.Properties;
* 1 (JAXBContextFactory) or 2 (no interface, static methods).
*
* @apiNote
- * Service discovery method using resource {@code /META-INF/services/javax.xml.bind.JAXBContext} (described in step 4)
+ * Service discovery method using resource {@code /META-INF/services/jakarta.xml.bind.JAXBContext} (described in step 4)
* is supported only to allow backwards compatibility, it is strongly recommended to migrate to standard
* {@link java.util.ServiceLoader} mechanism (described in step 3). The difference here is the resource name, which
* doesn't match service's type name.
* <p>
* Also using providers implementing interface {@link JAXBContextFactory} is preferred over using ones defining
* static methods, same as {@link JAXBContext#JAXB_CONTEXT_FACTORY} property is preferred over property
- * {@code "javax.xml.bind.context.factory"}
+ * {@code "jakarta.xml.bind.context.factory"}
*
* @implNote
* Within the last step, if Glassfish AS environment detected, its specific service loader is used to find factory class.
@@ -305,7 +305,7 @@ public abstract class JAXBContext {
* The name of the property that contains the name of the class capable
* of creating new {@code JAXBContext} objects.
*/
- public static final String JAXB_CONTEXT_FACTORY = "javax.xml.bind.JAXBContextFactory";
+ public static final String JAXB_CONTEXT_FACTORY = "jakarta.xml.bind.JAXBContextFactory";
protected JAXBContext() {
}
@@ -392,7 +392,7 @@ public abstract class JAXBContext {
* {@code <jaxb:globalBindings valueClass="false">},
* the JAXB provider will ensure that each package on the context path
* has a {@code jaxb.properties} file which contains a value for the
- * {@code javax.xml.bind.context.factory} property and that all values
+ * {@code jakarta.xml.bind.context.factory} property and that all values
* resolve to the same provider. This requirement does not apply to
* JAXB annotated classes.
*
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBContextFactory.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBContextFactory.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
index 75b42598dc3e3917c1a3a641b9ff62900b5ce44b..8b2ccafb38c3e0da979c256461d0c639daf4e878 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBContextFactory.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBContextFactory.java
@@ -8,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
import java.util.Map;
@@ -26,7 +26,7 @@ public interface JAXBContextFactory {
* Create a new instance of a {@code JAXBContext} class.
*
* <p>
- * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)}
+ * For semantics see {@link jakarta.xml.bind.JAXBContext#newInstance(Class[], java.util.Map)}
*
* @param classesToBeBound
* List of java classes to be recognized by the new {@link JAXBContext}.
@@ -67,7 +67,7 @@ public interface JAXBContextFactory {
* Create a new instance of a {@code JAXBContext} class.
*
* <p>
- * For semantics see {@link javax.xml.bind.JAXBContext#newInstance(String, ClassLoader, java.util.Map)}
+ * For semantics see {@link jakarta.xml.bind.JAXBContext#newInstance(String, ClassLoader, java.util.Map)}
*
* <p>
* The interpretation of properties is up to implementations. Implementations must
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBElement.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBElement.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBElement.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBElement.java
index 059e30f85bcf6e0ef2de591a49882c518e264182..6b247ce4198fa98b29d029b82f10e80e6618db3b 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBElement.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.QName;
import java.io.Serializable;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBException.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBException.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBException.java
index 3ca196829f6e9b4c710608280586cd0ca72e9ce9..659c9f11b120d9db36c0bd2fcb2f9ad894531dba 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBException.java
@@ -1,5 +1,5 @@
/*
- * 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.PrintWriter;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBIntrospector.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
similarity index 91%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBIntrospector.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
index 13c6479fc367ed42275b90642fca0b5044383813..0c4f951e5c1c92f8b78ee3556d7951c484b1af06 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBIntrospector.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBIntrospector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,8 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
+
import javax.xml.namespace.QName;
/**
@@ -34,7 +35,7 @@ public abstract class JAXBIntrospector {
* <p>Return true if <code>object</code> represents a JAXB element.</p>
* <p>Parameter <code>object</code> is a JAXB element for following cases:
* <ol>
- * <li>It is an instance of <code>javax.xml.bind.JAXBElement</code>.</li>
+ * <li>It is an instance of <code>jakarta.xml.bind.JAXBElement</code>.</li>
* <li>The class of <code>object</code> is annotated with
* <code>@XmlRootElement</code>.
* </li>
@@ -58,7 +59,7 @@ public abstract class JAXBIntrospector {
* <p>Get the element value of a JAXB element.</p>
*
* <p>Convenience method to abstract whether working with either
- * a javax.xml.bind.JAXBElement instance or an instance of
+ * a jakarta.xml.bind.JAXBElement instance or an instance of
* {@code @XmlRootElement} annotated Java class.</p>
*
* @param jaxbElement object that #isElement(Object) returns true.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java
index 9b64586b01a1e8e97e733e3be76080dffc6e6552..5d7a1cd5e51802fdf00bcf9b199a82d54e664a55 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/JAXBPermission.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/JAXBPermission.java
@@ -1,5 +1,5 @@
/*
- * 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.security.BasicPermission;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/MarshalException.java b/jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/MarshalException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java
index adcab34cb98e21aee6d5dc024cc0f9272f110f39..0556b0248eb0250e3736cc0f511972e20fea473c 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/MarshalException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/MarshalException.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This exception indicates that an error has occurred while performing
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Marshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java
index 126953523a789b9c06e669605fa946040ce98386..5c890be8416cfb9c3c7bf3382c5525d815557fa8 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Marshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Marshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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,11 +8,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.validation.Schema;
import java.io.File;
@@ -185,7 +185,7 @@ import java.io.File;
* prior to invoking one of the marshal API's, then events will be delivered to
* a default event handler which will terminate the marshal operation after
* encountering the first error or fatal error. Note that for JAXB 2.0 and
- * later versions, {@link javax.xml.bind.helpers.DefaultValidationEventHandler} is
+ * later versions, {@link jakarta.xml.bind.helpers.DefaultValidationEventHandler} is
* no longer used.
*
* </blockquote>
@@ -651,7 +651,7 @@ public interface Marshaller {
* Every marshaller internally maintains a
* {@link java.util.Map}<{@link Class},{@link XmlAdapter}>,
* which it uses for marshalling classes whose fields/methods are annotated
- * with {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
+ * with {@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
*
* <p>
* This method allows applications to use a configured instance of {@link XmlAdapter}.
@@ -660,7 +660,7 @@ public interface Marshaller {
*
* @param type
* The type of the adapter. The specified instance will be used when
- * {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter#value()}
+ * {@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter#value()}
* refers to this type.
* @param adapter
* The instance of the adapter to be used. If null, it will un-register
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Messages.java b/jaxb-api/src/main/java/jakarta/xml/bind/Messages.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/Messages.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Messages.java
index d42909ff7694ef2feaca96b8448c4a657d5fbe9a..507de8a79537167767a4bb5238488045f8ad59ce 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Messages.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Messages.java
@@ -1,5 +1,5 @@
/*
- * 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.text.MessageFormat;
import java.util.ResourceBundle;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java b/jaxb-api/src/main/java/jakarta/xml/bind/ModuleUtil.java
similarity index 92%
rename from jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ModuleUtil.java
index f34cdc79d76b2b850f18bc04b4536f5684a9d894..f1c8d0d0b98cbd0a27f5220b6657a098ee674d67 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ModuleUtil.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ModuleUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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.IOException;
@@ -22,7 +22,7 @@ class ModuleUtil {
/**
* When JAXB is in J2SE, rt.jar has to have a JAXB implementation.
- * However, rt.jar cannot have META-INF/services/javax.xml.bind.JAXBContext
+ * However, rt.jar cannot have META-INF/services/jakarta.xml.bind.JAXBContext
* because if it has, it will take precedence over any file that applications have
* in their jar files.
*
diff --git a/jaxb-api/src/main/java/javax/xml/bind/NotIdentifiableEvent.java b/jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/NotIdentifiableEvent.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
index 7c04b8210c63a1f9091db645b57eef8552b2351d..c63de7914a7baa7988705d7a63ccb91b8a312b31 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/NotIdentifiableEvent.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/NotIdentifiableEvent.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This event indicates that a problem was encountered resolving an ID/IDREF.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ParseConversionEvent.java b/jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
similarity index 89%
rename from jaxb-api/src/main/java/javax/xml/bind/ParseConversionEvent.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
index 0bc3de02b8562112050b842807f465214dc2cf81..30f02d712864dc2c904ebcb774ec3af8b2546175 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ParseConversionEvent.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ParseConversionEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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;
/**
* This event indicates that a problem was encountered while converting a
diff --git a/jaxb-api/src/main/java/javax/xml/bind/PrintConversionEvent.java b/jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
similarity index 89%
rename from jaxb-api/src/main/java/javax/xml/bind/PrintConversionEvent.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
index 6531e221527fb12d916a5f6c7b1b92943761a743..0937a62cd9af5d0b5135ff375824ebd5e0070637 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/PrintConversionEvent.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/PrintConversionEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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;
/**
* This event indicates that a problem was encountered while converting data
diff --git a/jaxb-api/src/main/java/javax/xml/bind/PropertyException.java b/jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/PropertyException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java
index 1d3426932b3d95f02bd77209ad8c6d398c117007..4afe7523821da0d98a2b769249df659ce8768418 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/PropertyException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/PropertyException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/SchemaOutputResolver.java b/jaxb-api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/SchemaOutputResolver.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
index f922dfef7e57842e912b493316bd02b3f2f34a85..525360854ead58e1e51598a59195fd38a5e4ccbf 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/SchemaOutputResolver.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/SchemaOutputResolver.java
@@ -1,5 +1,5 @@
/*
- * 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 javax.xml.transform.Result;
import java.io.IOException;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java b/jaxb-api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
index 6282251ba5322d0c72e624dbb3cdc9ac2a2ec12d..d943ea5b95d15a60b4d433ece0dd489112f35945 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ServiceLoaderUtil.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ServiceLoaderUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019 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,7 +8,7 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/TypeConstraintException.java b/jaxb-api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/TypeConstraintException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
index b351724d901f305be5467d8e15858aec8d7671a0..41142b48ba26a806408ec49f2d94cfb256c7855a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/TypeConstraintException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/TypeConstraintException.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This exception indicates that a violation of a dynamically checked type
diff --git a/jaxb-api/src/main/java/javax/xml/bind/UnmarshalException.java b/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/UnmarshalException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java
index c9758e2ad078e7c1d4317202f69b2800973c10e8..226edfb9e60dd7de7a7b7aa4bca52fe8d5b1a9d6 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/UnmarshalException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshalException.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This exception indicates that an error has occurred while performing
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/Unmarshaller.java
similarity index 99%
rename from jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Unmarshaller.java
index 6140c3877381d4af05641f410113a72bfbe7b16c..1f078ead61ea0366870e5c4b33e057833255f3ca 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Unmarshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Unmarshaller.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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,10 +8,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
import javax.xml.validation.Schema;
import java.io.Reader;
@@ -323,7 +323,7 @@ import java.io.Reader;
* than in JAXB 1.0. When schema-derived code generated
* by JAXB 1.0 binding compiler is registered with {@link JAXBContext},
* the default unmarshal validation handler is
- * {@link javax.xml.bind.helpers.DefaultValidationEventHandler} and it
+ * {@link jakarta.xml.bind.helpers.DefaultValidationEventHandler} and it
* terminates the marshal operation after encountering either a fatal error or an error.
* For a JAXB 2.0 client application, there is no explicitly defined default
* validation handler and the default event handling only
@@ -992,7 +992,7 @@ public interface Unmarshaller {
* Every unmarshaller internally maintains a
* {@link java.util.Map}<{@link Class},{@link XmlAdapter}>,
* which it uses for unmarshalling classes whose fields/methods are annotated
- * with {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
+ * with {@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.
*
* <p>
* This method allows applications to use a configured instance of {@link XmlAdapter}.
@@ -1001,7 +1001,7 @@ public interface Unmarshaller {
*
* @param type
* The type of the adapter. The specified instance will be used when
- * {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter#value()}
+ * {@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter#value()}
* refers to this type.
* @param adapter
* The instance of the adapter to be used. If null, it will un-register
diff --git a/jaxb-api/src/main/java/javax/xml/bind/UnmarshallerHandler.java b/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/UnmarshallerHandler.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
index 85c15ba29cb9005508169cda9bf9bbec1863bde1..11e4edf3a3f872b15187ba91b49012712e5d0030 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/UnmarshallerHandler.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/UnmarshallerHandler.java
@@ -1,5 +1,5 @@
/*
- * 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 org.xml.sax.ContentHandler;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ValidationEvent.java b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEvent.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/ValidationEvent.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ValidationEvent.java
index aadb64ec5c81ad7936e35f6565dfee2a7c9daf3e..d8ccd9e0ef70d9bb80aeb3cfcc31dec6218ee196 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ValidationEvent.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEvent.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This event indicates that a problem was encountered while validating the
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ValidationEventHandler.java b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/ValidationEventHandler.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
index 63900a4b8e9d94739a0144af2b73a276bfaabb33..3ad067ad3d5040e49fb33cec9735f1b49e774f40 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ValidationEventHandler.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventHandler.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* A basic event handler interface for validation errors.
@@ -51,7 +51,7 @@ package javax.xml.bind;
* @see Validator
* @see Marshaller
* @see ValidationEvent
- * @see javax.xml.bind.util.ValidationEventCollector
+ * @see jakarta.xml.bind.util.ValidationEventCollector
* @since 1.6, JAXB 1.0
*/
public interface ValidationEventHandler {
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ValidationEventLocator.java b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/ValidationEventLocator.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
index ff469776943489cb29c049800244a0282a144e9f..d21d0a37df98b38243a926e1f0aae7ad1b348f32 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ValidationEventLocator.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationEventLocator.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* Encapsulate the location of a ValidationEvent.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/ValidationException.java b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationException.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/ValidationException.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/ValidationException.java
index f189bc13078c8bf0205ed79b3cddd5d5392cee14..fb06626eee6307bbd2bcf10297a00676b72447cf 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/ValidationException.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/ValidationException.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* This exception indicates that an error has occurred while performing
diff --git a/jaxb-api/src/main/java/javax/xml/bind/Validator.java b/jaxb-api/src/main/java/jakarta/xml/bind/Validator.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/Validator.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/Validator.java
index 740248e6fe8b960dc4dd0840de539c7df0a5458a..127cb82ea57862c6b82ef3f5bd22dab3c96ee04a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/Validator.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/Validator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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;
/**
* As of JAXB 2.0, this class is deprecated and optional.
@@ -94,7 +94,7 @@ package javax.xml.bind;
* {@code Validator}.
* </dd>
*
- * <dt>Use the {@link javax.xml.bind.util.ValidationEventCollector ValidationEventCollector}
+ * <dt>Use the {@link jakarta.xml.bind.util.ValidationEventCollector ValidationEventCollector}
* utility</dt>
* <dd>For convenience, a specialized event handler is provided that
* simply collects any {@code ValidationEvent} objects created
@@ -138,7 +138,7 @@ package javax.xml.bind;
* @see Unmarshaller
* @see ValidationEventHandler
* @see ValidationEvent
- * @see javax.xml.bind.util.ValidationEventCollector
+ * @see jakarta.xml.bind.util.ValidationEventCollector
* @since 1.6, JAXB 1.0
* @deprecated since JAXB 2.0
*/
diff --git a/jaxb-api/src/main/java/javax/xml/bind/WhiteSpaceProcessor.java b/jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/WhiteSpaceProcessor.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
index 25f9debf020a92a117cb4d3cff4b754b29efce34..6e0a14c54a4e4eb39dec6e5c316a67a7f25f6b61 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/WhiteSpaceProcessor.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/WhiteSpaceProcessor.java
@@ -1,5 +1,5 @@
/*
- * 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;
/**
* Processes white space normalization.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/DomHandler.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/DomHandler.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
index 15ecc21e9c9bf604bcf3b65e70ffab7efd504d04..23b1eef601cfb50c80dcc776efdc6a0f47d4bc95 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/DomHandler.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/DomHandler.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
index 0165ca09d749eab6553ca4f0b974ae31687b5893..9dcb964b238d62c8b2c832683eb3798f03bd82da 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/W3CDomHandler.java
@@ -1,5 +1,5 @@
/*
- * 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,14 +8,14 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import javax.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
similarity index 89%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
index fc8c40fb7c3c073e207f23241fcf2955e731e661..d4768418e9141748d2e000c5d239c917e3cb2e1a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessOrder.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
/**
* Used by XmlAccessorOrder to control the ordering of properties and
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessType.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessType.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
index a4f6688a4a3302dfb10a2bb84e4d0210cb59813f..8ca6a30a7dc7f64f6f6ebb43542767a0aaac86f9 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessType.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessType.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
index 98ef2e29b79e6a47b3b81334d3d18a5ca060bc93..4fad316694543e43f6f22ccb4889fa8cab455559 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorOrder.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.Inherited;
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li> a top level class </li>
* </ul>
*
- * <p> See "Package Specification" in {@code javax.xml.bind} package javadoc for
+ * <p> See "Package Specification" in {@code jakarta.xml.bind} package javadoc for
* additional common information.</p>
*
* <p>The effective {@link XmlAccessOrder} on a class is determined
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
similarity index 91%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
index 85f25038673054b01296e4acaf0fb1201d12418b..a950c12f9425936e661a0d4f6cee6bd35fe1edb5 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAccessorType.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.Inherited;
@@ -30,7 +30,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li> a top level class </li>
* </ul>
*
- * <p> See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p> See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p>This annotation provides control over the default serialization
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
similarity index 90%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
index 219d8affa47335fc57202043a128339b06f6c6ab..002255d102e136fc12448f8fd015fd0762466c8f 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyAttribute.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import javax.xml.namespace.QName;
import java.lang.annotation.Retention;
@@ -32,7 +32,7 @@ import static java.lang.annotation.ElementType.METHOD;
* <li> non static, non transient field </li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* The usage is subject to the following constraints:
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
index d9684fcbddf8f7e75b3d4378426627fcc78ca855..d884c0979a197811c8614f44ed285c0f133a06fd 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAnyElement.java
@@ -1,5 +1,5 @@
/*
- * 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,13 +8,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
import org.w3c.dom.Element;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.List;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
index ae9a9c70c4bb14ac33bfbeecd455db5c7781861f..9fcb0ef025a5d3ce65cc0b2bb8176bd4f3bb4e97 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttachmentRef.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import javax.activation.DataHandler;
import static java.lang.annotation.ElementType.*;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttribute.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
similarity index 93%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttribute.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
index d08b004f941986e7d42bee6df4c0a068c8304e4e..7b012fdc01cb6ecc2e91d79a1f8d4e9f4e743b66 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlAttribute.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlAttribute.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.*;
*
* <p> A static final field is mapped to a XML fixed attribute.
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* The usage is subject to the following constraints:
@@ -63,7 +63,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* {@link XmlAttachmentRef},
* {@link XmlMimeType},
* {@link XmlInlineBinaryData},
- * {@link javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.</li>
+ * {@link jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter}.</li>
* </ul>
*
* <p> <b>Example 1: </b>Map a JavaBean property to an XML attribute.</p>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElement.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElement.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
index b44c06ce935803dd17e472077171380974f81cde..9d6cf757ff65e1e448a5816eeae19f1216b89650 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElement.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
index 08720e5b3f95a40afeac3b61c894b543390f4481..7dfcb29213d5b65b75ce0b3f8b61dd9334114c86 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementDecl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRef.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRef.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
index f3e44164e52f91c842762de662b10a2e1f6219ef..26605ca53f4fd20e92df94c38df984aaeb1b1682 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRef.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -58,7 +58,7 @@ import static java.lang.annotation.ElementType.METHOD;
* <ul>
* <li> If the collection item type (for collection property) or
* property type (for single valued property) is
- * {@link javax.xml.bind.JAXBElement}, then
+ * {@link jakarta.xml.bind.JAXBElement}, then
* {@code @XmlElementRef.name()} and {@code @XmlElementRef.namespace()} must
* point an element factory method with an @XmlElementDecl
* annotation in a class annotated with @XmlRegistry (usually
@@ -70,13 +70,13 @@ import static java.lang.annotation.ElementType.METHOD;
* </li>
* <li> If the collection item type (for collection property) or
* property type (for single valued property) is not
- * {@link javax.xml.bind.JAXBElement}, then the type referenced by the
+ * {@link jakarta.xml.bind.JAXBElement}, then the type referenced by the
* property or field must be annotated with {@link XmlRootElement}. </li>
* <li> This annotation can be used with the following annotations:
* {@link XmlElementWrapper}, {@link XmlJavaTypeAdapter}.
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p><b>Example 1: Ant Task Example</b></p>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
similarity index 89%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
index b010b56bd44d21c8dd1ec50cec3ebc44887b7ecd..5b66cf24014e8d80cf7a37a622c29fb09dfbb91e 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementRefs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
index be2e7fb533218933d39d853176e714eee86a8cc8..57aa28b4a5ad489c32a2e098e5a3b7738005063f 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElementWrapper.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
@@ -64,7 +64,7 @@ import java.lang.annotation.Target;
* {@link XmlJavaTypeAdapter}.</li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElements.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElements.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
index d79310197321b4c85a1e7da70acb6ec854f34900..2e0b7c63ce754c7453a76d63c8b519b2076c16fa 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlElements.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlElements.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
@@ -50,7 +50,7 @@ import java.lang.annotation.Target;
* property annotated with {@code @XmlID}.</li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <hr>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnum.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
similarity index 90%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnum.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
index 4be0babad8e4be019150177c143531ebeeffd292..1bed7e0e21a0da798a912f536252d3f70e8d471a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnum.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnum.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
* {@link XmlType},
* {@link XmlRootElement} </li>
* </ul>
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information </p>
*
* <p>An enum type is mapped to a schema simple type with enumeration
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
index cbce05d1627a2c1ed1162ade0ee9ae6e5857003f..6d92e14d091363957d324d11428800b37d0ffa77 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlEnumValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -26,7 +26,7 @@ import static java.lang.annotation.ElementType.FIELD;
* <li>enum constant</li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p>This annotation, together with {@link XmlEnum} provides a
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlID.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
similarity index 93%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlID.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
index 40acd7cc0827de082ec9e7871ad183c1ced18d7f..2e67f73d6ac5d753f80754afde1467b4def03923 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlID.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlID.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
@@ -35,7 +35,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li> non static, non transient field </li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* The usage is subject to the following constraints:
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlIDREF.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlIDREF.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
index 66428672c9e1d70297ebd8b9a795c4abcc4c8866..31db3846c9f1f5cd624ee69ddea9ddd7f62a4c09 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlIDREF.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlIDREF.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
@@ -35,7 +35,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li> non static, non transient field </li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p> The usage is subject to the following constraints:
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
similarity index 91%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
index 63756abd45e1f5a3475a114958b0879c99db32f0..9ee457c134e0a45a0eed311b629700e9cf89cd99 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlInlineBinaryData.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -18,7 +18,7 @@ import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
import javax.xml.transform.Source;
-import javax.xml.bind.attachment.AttachmentMarshaller;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
import javax.activation.DataHandler;
/**
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlList.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlList.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
index febd421848eb0ad82cbc7e162282e610332292e7..968352131cf47eeac5ab933a750600461a7d2451 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlList.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlList.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMimeType.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
similarity index 93%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMimeType.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
index aeac46e7df97b39313714bbaa719d38aa1f42f69..f869915e5c64a34b69e12f532f931b39ee48e9a5 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMimeType.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMimeType.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMixed.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMixed.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
index 43668d99d5a60812002063e8102184d568317ef5..601ce77c9b331d52b4a42ce27f38e6dfeac675bb 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlMixed.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlMixed.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -18,7 +18,7 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import org.w3c.dom.Element;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
/**
* <p>
@@ -107,7 +107,7 @@ import javax.xml.bind.JAXBElement;
* gcl.add("shipped from our warehouse"); // add text information item
* }</pre>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
* @author Kohsuke Kawaguchi
* @since 1.6, JAXB 2.0
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNs.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
similarity index 84%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNs.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
index f8cc67461f2110aece26838b82ea480f48fd0fda..2e4f5eceb255874d784d232a7c2c3b1fc6b4673c 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNs.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -22,7 +22,7 @@ import java.lang.annotation.Target;
* <p>{@code @XmlNs} annotation is intended for use from other
* program annotations.
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p><b>Example:</b>See {@code XmlSchema} annotation type for an example.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
index 8cfe3795a8f5f2d9d3860270a8ddac0998f21c94..92cbbd771a07d4f4ef57cb420ca022ef7bfeca1a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlNsForm.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
/**
* Enumeration of XML Schema namespace qualifications.
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p><b>Usage</b>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRegistry.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRegistry.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
index 4d113ea3175bfe5aa108d14aa64a85dd79108c59..a8d6a42aec09b539b2e2bbd83d2912ac1050f11d 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRegistry.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRegistry.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRootElement.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRootElement.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
index 33a979127d15216ef147d02b54dc563e99f28fa7..33804aed023c527819e1b3131b789e7f2a18ede5 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlRootElement.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlRootElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -28,7 +28,7 @@ import static java.lang.annotation.ElementType.TYPE;
* <li> an enum type </li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchema.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchema.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
index e013dd63a7d8ded78dd6939a7fb897125e8b8092..ddb7437a7d7fae72c566e991f7091a605a985996 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchema.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchema.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -45,7 +45,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* package is mapped.</p>
*
* <pre>
- * @javax.xml.bind.annotation.XmlSchema (
+ * @jakarta.xml.bind.annotation.XmlSchema (
* namespace = "http://www.example.com/MYPO1"
* )
* {@code
@@ -65,12 +65,12 @@ import static java.lang.annotation.RetentionPolicy.*;
*
* <pre>
* // Package level annotation
- * @javax.xml.bind.annotation.XmlSchema (
+ * @jakarta.xml.bind.annotation.XmlSchema (
* xmlns = {
- * @javax.xml.bind.annotation.XmlNs(prefix = "po",
+ * @jakarta.xml.bind.annotation.XmlNs(prefix = "po",
* namespaceURI="http://www.example.com/myPO1"),
*
- * @javax.xml.bind.annotation.XmlNs(prefix="xs",
+ * @jakarta.xml.bind.annotation.XmlNs(prefix="xs",
* namespaceURI="http://www.w3.org/2001/XMLSchema")
* }
* )
@@ -86,7 +86,7 @@ import static java.lang.annotation.RetentionPolicy.*;
*
* <p><b>Example 3:</b> Customize elementFormDefault</p>
* <pre>
- * @javax.xml.bind.annotation.XmlSchema (
+ * @jakarta.xml.bind.annotation.XmlSchema (
* elementFormDefault=XmlNsForm.UNQUALIFIED
* ...
* )
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
index 15040d76fc67591060b81ccf2e0909076e76362f..6bbd4db19654d5afcef79f35b0e07118cb581556 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaType.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -64,7 +64,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
* level </p>
* <pre>
* package foo;
- * @javax.xml.bind.annotation.XmlSchemaType(
+ * @jakarta.xml.bind.annotation.XmlSchemaType(
* name="date", type=javax.xml.datatype.XMLGregorianCalendar.class)
* }
* </pre>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
index 47f8cb7796a7c7073040f1709dcdf6b9f99d7fee..42d0f91e4752c8a66faef56fd0445fb497f3577a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSchemaTypes.java
@@ -1,5 +1,5 @@
/*
- * 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.annotation;
+package jakarta.xml.bind.annotation;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.PACKAGE;
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* define {@link XmlSchemaType} for different types at the
* package level.
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
similarity index 92%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
index 037ed494df2bf13e8db9990b96295ad302c7d0ee..46177031c0fb59fc557b102afef594f57c8a9888 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlSeeAlso.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation;
+package jakarta.xml.bind.annotation;
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlTransient.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
similarity index 93%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlTransient.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
index 585e09c1ccd6b9199cac23e5e057c5f3aaf20f35..55c81714500b5d0eb29129f68adef7870df3eacd 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlTransient.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlTransient.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
@@ -45,7 +45,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <p>{@code @XmlTransient} is mutually exclusive with all other
* JAXB defined annotations. </p>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <p><b>Example:</b> Resolve name collision between JavaBean property and
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
index 103642e6fa6812c21730acde02b41490091b8753..395a03b02dddf2d8eb6d167917e2737c48fc6ef0 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlType.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
* <li> an enum type </li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* <h3> Mapping a Class </h3>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlValue.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/XmlValue.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
index f1c018401c7bb71635e589000c40ba589c6c86af..f379e897b79b8d4fa56c38d9b6eb44c7171163de 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/XmlValue.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/XmlValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation;
+package jakarta.xml.bind.annotation;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li> non static, non transient field.</li>
* </ul>
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* The usage is subject to the following usage constraints:
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
index 6f284b7858034c627c4a9641f56e49c31cd36763..198a21f81fe4aa2191e595dc9c15670e2d2004b2 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/CollapsedStringAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
similarity index 84%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
index b6fc58604065b88cec2ccf9f202548297a3bbbbf..f0fb84f007de5d5f31e4f9b490af047db81c7ce2 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/HexBinaryAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
/**
* {@link XmlAdapter} for {@code xs:hexBinary}.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
index b79e77a9bbe91452e382a4346d1647c815987345..dcdedcc7172a963cd8a5089a4b898fe45472f501 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/NormalizedStringAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
index bf87571b6621f10952e7f22a51a9b7c1a8ee805a..7e71fcf0980747b526d7998b014c14e9d6d0988f 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
/**
* Adapts a Java type for custom marshaling.
@@ -161,7 +161,7 @@ public abstract class XmlAdapter<ValueType,BoundType> {
* The value to be converted. Can be null.
* @throws Exception
* if there's an error during the conversion. The caller is responsible for
- * reporting the error to the user through {@link javax.xml.bind.ValidationEventHandler}.
+ * reporting the error to the user through {@link jakarta.xml.bind.ValidationEventHandler}.
*/
public abstract BoundType unmarshal(ValueType v) throws Exception;
@@ -172,7 +172,7 @@ public abstract class XmlAdapter<ValueType,BoundType> {
* The value to be convereted. Can be null.
* @throws Exception
* if there's an error during the conversion. The caller is responsible for
- * reporting the error to the user through {@link javax.xml.bind.ValidationEventHandler}.
+ * reporting the error to the user through {@link jakarta.xml.bind.ValidationEventHandler}.
*/
public abstract ValueType marshal(BoundType v) throws Exception;
}
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
similarity index 85%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
index e7cecd54b370a70fbc39544179c57a72ec27d0ea..22d92c489fd427d1e7565b78c6bdaeb880a49dfa 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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,17 +8,17 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSchemaTypes;
+import jakarta.xml.bind.annotation.XmlAnyElement;
+import jakarta.xml.bind.annotation.XmlElementRefs;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlElementRef;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlSchemaTypes;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
index 8e2a06888979291c960ef9d4d8a278359a90d528..273da470074a2612d868808b2596d10b8bd862e8 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
import static java.lang.annotation.ElementType.PACKAGE;
import java.lang.annotation.Retention;
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
* defining {@link XmlJavaTypeAdapter} annotations for different types
* at the package level.
*
- * <p>See "Package Specification" in javax.xml.bind.package javadoc for
+ * <p>See "Package Specification" in jakarta.xml.bind.package javadoc for
* additional common information.</p>
*
* @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li></ul>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
similarity index 83%
rename from jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
index 8fbd5f2b02a1dae321c79673fc91e4a1e96609e0..305aa31ca3afbe3236ecebfff5b3f5a45085b98c 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/adapters/package-info.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/adapters/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 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
@@ -9,7 +9,7 @@
*/
/**
- * {@link javax.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
+ * {@link jakarta.xml.bind.annotation.adapters.XmlAdapter} and its spec-defined
* sub-classes to allow arbitrary Java classes to be used with Jakarta XML Binding.
*
* <p>
@@ -31,4 +31,4 @@
*
* @see <a href="https://projects.eclipse.org/projects/ee4j.jaxb">Jakarta XML Binding Website</a>
*/
-package javax.xml.bind.annotation.adapters;
+package jakarta.xml.bind.annotation.adapters;
diff --git a/jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..d3f587bc6c5d67d0ebe6206d925a996c55d75f3f
--- /dev/null
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/annotation/package-info.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2004, 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
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * Defines annotations for customizing Java program elements to XML Schema mapping.
+ * <p>
+ * References in this document to JAXB refer to the Jakarta XML Binding unless otherwise noted.
+ *
+ * <h2>Package Specification</h2>
+ * <p>The following table shows the JAXB mapping annotations
+ * that can be associated with each program element. </p>
+ * <p>
+ * <table class="striped">
+ * <caption>Annotations for customizing Java program elements to XML Schema mapping</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Program Element</th>
+ * <th scope="col">JAXB annotation</th>
+ * </tr>
+ * </thead>
+ * <tbody style="text-align:left">
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Package</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlSchema.html">XmlSchema</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Class</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlType.html">XmlType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Enum type</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlEnum.html">XmlEnum</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlType.html">XmlType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">JavaBean Property/field</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElement.html">XmlElement</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElements.html">XmlElements</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlTransient.html">XmlTransient</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlValue.html">XmlValue</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlID.html">XmlID</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlList.html">XmlList</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlMixed.html">XmlMixed</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * <tr>
+ * <th scope="row" style="vertical-align:top">Parameter</th>
+ * <td>
+ * <ul style="list-style-type:none">
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlList.html">XmlList</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
+ * <li><a HREF="../../../../jakarta/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
+ * </ul>
+ * </td>
+ * </tr>
+ * </tbody>
+ * </table>
+ * <h3>Terminology</h3>
+ * <p>
+ * <b>JavaBean property and field:</b> For the purposes of
+ * mapping, there is no semantic difference between a field and
+ * a JavaBean property. Thus, an annotation that can be applied
+ * to a JavaBean property can always be applied to a
+ * field. Hence in the Javadoc documentation, for brevity, the
+ * term JavaBean property or property is used to mean either JavaBean
+ * property or a field. Where required, both are explicitly
+ * mentioned.
+ * <p>
+ * <b>top level class:</b> For the purpose of mapping, there is
+ * no semantic difference between a top level class and a
+ * static nested class. Thus, an annotation that can be applied
+ * to a top level class, can always be applied to a nested
+ * static class. Hence in the Javadoc documentation, for
+ * brevity, the term "top level class" or just class is used to
+ * mean either a top level class or a nested static
+ * class.
+ * <p>
+ * <b>mapping annotation:</b>A JAXB 2.0 defined program
+ * annotation based on the JSR 175 programming annotation
+ * facility.
+ * <h3>Common Usage Constraints</h3>
+ * <p>The following usage constraints are defined here since
+ * they apply to more than annotation:
+ * <ul>
+ * <li> For a property, a given annotation can be applied to
+ * either read or write property but not both. </li>
+ * <li> A property name must be different from any other
+ * property name in any of the super classes of the
+ * class being mapped. </li>
+ * <li> A mapped field name or the decapitalized name of a
+ * mapped property must be unique within a class. </li>
+ * </ul>
+ * <h3>Notations</h3>
+ * <b>Namespace prefixes</b>
+ * <p>The following namespace prefixes are used in the XML Schema
+ * fragments in this package.
+ * <p>
+ * <table class="striped">
+ * <caption>XML Schema fragments namespace prefixes</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Prefix</th>
+ * <th scope="col">Namespace</th>
+ * <th scope="col">Notes</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <th scope="row">xs</th>
+ * <td>http://www.w3.org/2001/XMLSchema</td>
+ * <td>Namespace of XML Schema namespace</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">ref</th>
+ * <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
+ * <td>Namespace for swaref schema component</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">xsi</th>
+ * <td>http://www.w3.org/2001/XMLSchema-instance</td>
+ * <td>XML Schema namespace for instances</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
+ * @since 1.6, JAXB 2.0
+ */
+package jakarta.xml.bind.annotation;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
similarity index 98%
rename from jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
index c3e81e69276a5151ff1043eb51497098eb3b3c4a..865861693c44740480bad4770157e14340d88299 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentMarshaller.java
@@ -1,5 +1,5 @@
/*
- * 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,10 +8,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.attachment;
+package jakarta.xml.bind.attachment;
import javax.activation.DataHandler;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.Marshaller;
/**
* <p>Enable JAXB marshalling to optimize storage of binary data.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
index 71e507b6dc612971e1d14763af761acd077eb3d2..50f1ed466b8758c7bee39f12d2a4976e9f960fa2 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/AttachmentUnmarshaller.java
@@ -1,5 +1,5 @@
/*
- * 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.attachment;
+package jakarta.xml.bind.attachment;
import javax.activation.DataHandler;
@@ -45,7 +45,7 @@ import javax.activation.DataHandler;
*
* @since 1.6, JAXB 2.0
*
- * @see javax.xml.bind.Unmarshaller#setAttachmentUnmarshaller(AttachmentUnmarshaller)
+ * @see jakarta.xml.bind.Unmarshaller#setAttachmentUnmarshaller(AttachmentUnmarshaller)
*
* @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">XML-binary Optimized Packaging</a>
* @see <a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html">WS-I Attachments Profile Version 1.0.</a>
diff --git a/jaxb-api/src/main/java/javax/xml/bind/attachment/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/attachment/package-info.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java
index 05cf1fb0bed98867fe16f8c101e38407cd839ddd..cf0b1d91146eb73108ed22124d25d9139beb4230 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/attachment/package-info.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/attachment/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2019 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
@@ -43,4 +43,4 @@
* @see <a href="http://www.w3.org/TR/xml-media-types/">[4]Describing Media Content of Binary Data in XML</a>
* @since JAXB 2.0
*/
-package javax.xml.bind.attachment;
+package jakarta.xml.bind.attachment;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
index 80c78ee89bf936e41d0c67ecfa825a865b3ef5c8..4282fe579021f4b5966604909409dfb6d3a954fe 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractMarshallerImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,14 +8,14 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMResult;
@@ -37,7 +37,7 @@ import java.io.IOException;
*
* <p>
* This class provides a partial default implementation for the
- * {@link javax.xml.bind.Marshaller} interface.
+ * {@link jakarta.xml.bind.Marshaller} interface.
*
* <p>
* The only methods that a JAXB Provider has to implement are
@@ -46,7 +46,7 @@ import java.io.IOException;
* {@link Marshaller#marshal(Object, javax.xml.transform.Result) marshal(Object, javax.xml.stream.XMLEventWriter)}.
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.Marshaller
+ * @see jakarta.xml.bind.Marshaller
* @since 1.6, JAXB 1.0
*/
public abstract class AbstractMarshallerImpl implements Marshaller
@@ -372,14 +372,14 @@ public abstract class AbstractMarshallerImpl implements Marshaller
throw new PropertyException(name);
}
/**
- * @see javax.xml.bind.Marshaller#getEventHandler()
+ * @see jakarta.xml.bind.Marshaller#getEventHandler()
*/
public ValidationEventHandler getEventHandler() throws JAXBException {
return eventHandler;
}
/**
- * @see javax.xml.bind.Marshaller#setEventHandler(ValidationEventHandler)
+ * @see jakarta.xml.bind.Marshaller#setEventHandler(ValidationEventHandler)
*/
public void setEventHandler(ValidationEventHandler handler)
throws JAXBException {
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
index ef1601788217147004ab006b83c3edb4f8ed79d3..840ee5d94eefa41e6eedf1e336f6932c17f7c976 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/AbstractUnmarshallerImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,21 +8,21 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.w3c.dom.Node;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.UnmarshalException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.attachment.AttachmentUnmarshaller;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.stream.XMLEventReader;
@@ -40,7 +40,7 @@ import java.net.URL;
*
* <p>
* This class provides a partial default implementation for the
- * {@link javax.xml.bind.Unmarshaller}interface.
+ * {@link jakarta.xml.bind.Unmarshaller}interface.
*
* <p>
* A JAXB Provider has to implement five methods (getUnmarshallerHandler,
@@ -50,7 +50,7 @@ import java.net.URL;
* @author <ul>
* <li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li>
* </ul>
- * @see javax.xml.bind.Unmarshaller
+ * @see jakarta.xml.bind.Unmarshaller
* @since 1.6, JAXB 1.0
*/
public abstract class AbstractUnmarshallerImpl implements Unmarshaller
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
similarity index 88%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
index 51e0f20337a46d6e64a4baaf0c74165f8e8248c7..64e683cd29b0b15a83e133fbe680fe0e96a63bca 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/DefaultValidationEventHandler.java
@@ -1,5 +1,5 @@
/*
- * 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,13 +8,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
import org.w3c.dom.Node;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationEventLocator;
import java.net.URL;
/**
@@ -30,13 +30,13 @@ import java.net.URL;
* <p>
* This handler is not the default handler for JAXB mapped classes following
* JAXB 2.0 or later versions. Default validation event handling has changed
- * and is specified in {@link javax.xml.bind.Unmarshaller} and
- * {@link javax.xml.bind.Marshaller}.
+ * and is specified in {@link jakarta.xml.bind.Unmarshaller} and
+ * {@link jakarta.xml.bind.Marshaller}.
*
* @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.Unmarshaller
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.Unmarshaller
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
* @since 1.6, JAXB 1.0
*/
public class DefaultValidationEventHandler implements ValidationEventHandler {
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/Messages.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java
similarity index 96%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/Messages.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java
index d9b40796abc7ee24941c20848f4366859278b8b8..66967aefb94bef41f8b993fb41920184a8d05325 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/Messages.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/Messages.java
@@ -1,5 +1,5 @@
/*
- * 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.helpers;
+package jakarta.xml.bind.helpers;
import java.text.MessageFormat;
import java.util.ResourceBundle;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
similarity index 84%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
index ce41b7c951b1585ea3d6a5b23bf4ecf368d73440..702f99819c68c52ddf42b6da07c698555cff9c4a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/NotIdentifiableEventImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,9 +8,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ValidationEventLocator;
/**
* Default implementation of the NotIdentifiableEvent interface.
@@ -21,16 +21,16 @@ import javax.xml.bind.ValidationEventLocator;
* convenience.
*
* @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.NotIdentifiableEvent
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.NotIdentifiableEvent
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class NotIdentifiableEventImpl
extends ValidationEventImpl
- implements javax.xml.bind.NotIdentifiableEvent {
+ implements jakarta.xml.bind.NotIdentifiableEvent {
/**
* Create a new NotIdentifiableEventImpl.
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
similarity index 84%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
index 78fce0642d5d135aa2fd63175807fde25860277f..e5f2e9550bcea44a593587a71c0d35ad853460f8 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ParseConversionEventImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,10 +8,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
-import javax.xml.bind.ParseConversionEvent;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ParseConversionEvent;
+import jakarta.xml.bind.ValidationEventLocator;
/**
* Default implementation of the ParseConversionEvent interface.
@@ -22,11 +22,11 @@ import javax.xml.bind.ValidationEventLocator;
* convenience.
*
* @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.ParseConversionEvent
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.ParseConversionEvent
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class ParseConversionEventImpl
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
similarity index 84%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
index 5a2485b00037b840b7c191e61d7ae9bbaf88d031..a8e18f6e99e9fce06d21cb20e39b3b5c5d21e957 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/PrintConversionEventImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,10 +8,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
-import javax.xml.bind.PrintConversionEvent;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.PrintConversionEvent;
+import jakarta.xml.bind.ValidationEventLocator;
/**
* Default implementation of the PrintConversionEvent interface.
@@ -22,11 +22,11 @@ import javax.xml.bind.ValidationEventLocator;
* convenience.
*
* @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.PrintConversionEvent
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.PrintConversionEvent
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class PrintConversionEventImpl
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
similarity index 93%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
index 88cafcf6b02090bbfe345d78038328fbe6e03d0e..caeea3fed866ef71e0ea27893a2023ba8fe9a102 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,12 +8,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
import java.text.MessageFormat;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventLocator;
/**
* Default implementation of the ValidationEvent interface.
@@ -24,10 +24,10 @@ import javax.xml.bind.ValidationEventLocator;
* convenience.
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class ValidationEventImpl implements ValidationEvent
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
similarity index 90%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
index 139b00026f912b23034945b985c76c10ab8b4efc..54001dcab3c86e90891b1fec8b0ed479c7b1d63b 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/ValidationEventLocatorImpl.java
@@ -1,5 +1,5 @@
/*
- * 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,13 +8,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
import java.net.URL;
import java.net.MalformedURLException;
import java.text.MessageFormat;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ValidationEventLocator;
import org.w3c.dom.Node;
import org.xml.sax.Locator;
import org.xml.sax.SAXParseException;
@@ -28,10 +28,10 @@ import org.xml.sax.SAXParseException;
* convenience.
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class ValidationEventLocatorImpl implements ValidationEventLocator
@@ -145,7 +145,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
/**
- * @see javax.xml.bind.ValidationEventLocator#getURL()
+ * @see jakarta.xml.bind.ValidationEventLocator#getURL()
*/
public URL getURL() {
return url;
@@ -161,7 +161,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
}
/**
- * @see javax.xml.bind.ValidationEventLocator#getOffset()
+ * @see jakarta.xml.bind.ValidationEventLocator#getOffset()
*/
public int getOffset() {
return offset;
@@ -177,7 +177,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
}
/**
- * @see javax.xml.bind.ValidationEventLocator#getLineNumber()
+ * @see jakarta.xml.bind.ValidationEventLocator#getLineNumber()
*/
public int getLineNumber() {
return lineNumber;
@@ -193,7 +193,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
}
/**
- * @see javax.xml.bind.ValidationEventLocator#getColumnNumber()
+ * @see jakarta.xml.bind.ValidationEventLocator#getColumnNumber()
*/
public int getColumnNumber() {
return columnNumber;
@@ -209,7 +209,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
}
/**
- * @see javax.xml.bind.ValidationEventLocator#getObject()
+ * @see jakarta.xml.bind.ValidationEventLocator#getObject()
*/
public Object getObject() {
return object;
@@ -225,7 +225,7 @@ public class ValidationEventLocatorImpl implements ValidationEventLocator
}
/**
- * @see javax.xml.bind.ValidationEventLocator#getNode()
+ * @see jakarta.xml.bind.ValidationEventLocator#getNode()
*/
public Node getNode() {
return node;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java
similarity index 87%
rename from jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java
index 3243ef996745afaedddbd565bc201ec4a1d36e4a..d7314d42c43299dba816ab8c235b6298dbe84855 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/helpers/package-info.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/helpers/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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
@@ -10,7 +10,7 @@
/**
* <B>Jakarta XML Binding Provider Use Only:</b> Provides partial default implementations for
- * some of the <code>javax.xml.bind</code> interfaces.
+ * some of the <code>jakarta.xml.bind</code> interfaces.
*
* <p>
* Jakarta XML Binding Providers can extend these classes and implement the abstract
@@ -35,4 +35,4 @@
*
* @see <a href="https://projects.eclipse.org/projects/ee4j.jaxb">Jakarta XML Binding Website</a>
*/
-package javax.xml.bind.helpers;
+package jakarta.xml.bind.helpers;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/package-info.java
similarity index 92%
rename from jaxb-api/src/main/java/javax/xml/bind/package-info.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/package-info.java
index 1371a90b4f4476d0ecd3d65ef627898527b23eb7..b1b83f625093905dfdc03c0eeda74884faedf6fb 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/package-info.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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
@@ -35,4 +35,4 @@
*
* @see <a href="https://projects.eclipse.org/projects/ee4j.jaxb">Jakarta XML Binding Website</a>
*/
-package javax.xml.bind;
+package jakarta.xml.bind;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/util/JAXBResult.java b/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
similarity index 94%
rename from jaxb-api/src/main/java/javax/xml/bind/util/JAXBResult.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
index 8739af094e75bcca7f092523b8c838e3eb125f58..2f7d8c1309dcdd517e08508819b964691a8373c0 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/util/JAXBResult.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBResult.java
@@ -1,5 +1,5 @@
/*
- * 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,12 +8,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.util;
+package jakarta.xml.bind.util;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.UnmarshallerHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.UnmarshallerHandler;
import javax.xml.transform.sax.SAXResult;
/**
diff --git a/jaxb-api/src/main/java/javax/xml/bind/util/JAXBSource.java b/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
similarity index 97%
rename from jaxb-api/src/main/java/javax/xml/bind/util/JAXBSource.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
index dc4469dfc640724c1849b8ba0a160917bf5c5b43..cc518261de84b247bc0f0195c45ec622e50de579 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/util/JAXBSource.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/util/JAXBSource.java
@@ -1,5 +1,5 @@
/*
- * 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.util;
+package jakarta.xml.bind.util;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
@@ -22,9 +22,9 @@ import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.XMLFilterImpl;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
import javax.xml.transform.sax.SAXSource;
import org.xml.sax.XMLFilter;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/util/Messages.java b/jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java
similarity index 95%
rename from jaxb-api/src/main/java/javax/xml/bind/util/Messages.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java
index 6789c8042489166edd8059325fa983729845b7a8..65c0f58c9f3f7641670cf827ce898a09ccffd07a 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/util/Messages.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/util/Messages.java
@@ -1,5 +1,5 @@
/*
- * 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.util;
+package jakarta.xml.bind.util;
import java.text.MessageFormat;
import java.util.ResourceBundle;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/util/ValidationEventCollector.java b/jaxb-api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
similarity index 86%
rename from jaxb-api/src/main/java/javax/xml/bind/util/ValidationEventCollector.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
index 6df2e4c433736c2064ef3e694ccc48d272eecef0..f2f9d09a9475f995efffe73f890e08213a2d1117 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/util/ValidationEventCollector.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/util/ValidationEventCollector.java
@@ -1,5 +1,5 @@
/*
- * 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,15 +8,15 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-package javax.xml.bind.util;
+package jakarta.xml.bind.util;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
import java.util.ArrayList;
import java.util.List;
/**
- * {@link javax.xml.bind.ValidationEventHandler ValidationEventHandler}
+ * {@link jakarta.xml.bind.ValidationEventHandler ValidationEventHandler}
* implementation that collects all events.
*
* <p>
@@ -26,10 +26,10 @@ import java.util.List;
* the reported errors and warnings.
*
* @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @see javax.xml.bind.Validator
- * @see javax.xml.bind.ValidationEventHandler
- * @see javax.xml.bind.ValidationEvent
- * @see javax.xml.bind.ValidationEventLocator
+ * @see jakarta.xml.bind.Validator
+ * @see jakarta.xml.bind.ValidationEventHandler
+ * @see jakarta.xml.bind.ValidationEvent
+ * @see jakarta.xml.bind.ValidationEventLocator
* @since 1.6, JAXB 1.0
*/
public class ValidationEventCollector implements ValidationEventHandler
diff --git a/jaxb-api/src/main/java/javax/xml/bind/util/package-info.java b/jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java
similarity index 90%
rename from jaxb-api/src/main/java/javax/xml/bind/util/package-info.java
rename to jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java
index e56c5c0c75d4e04671b52096b154ecde948f16ca..2f4971ba2db257c466e6cf160f496c5176cc4820 100644
--- a/jaxb-api/src/main/java/javax/xml/bind/util/package-info.java
+++ b/jaxb-api/src/main/java/jakarta/xml/bind/util/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019 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
@@ -30,4 +30,4 @@
*
* @see <a href="https://projects.eclipse.org/projects/ee4j.jaxb">Jakarta XML Binding Website</a>
*/
-package javax.xml.bind.util;
+package jakarta.xml.bind.util;
diff --git a/jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java b/jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java
deleted file mode 100644
index 7c9f8e7dd01b7ed000511fa9f0c96cc4d1926039..0000000000000000000000000000000000000000
--- a/jaxb-api/src/main/java/javax/xml/bind/annotation/package-info.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2004, 2019 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
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/**
- * Defines annotations for customizing Java program elements to XML Schema mapping.
- * <p>
- * References in this document to JAXB refer to the Jakarta XML Binding unless otherwise noted.
- *
- * <h2>Package Specification</h2>
- * <p>The following table shows the JAXB mapping annotations
- * that can be associated with each program element. </p>
- * <p>
- * <table class="striped">
- * <caption>Annotations for customizing Java program elements to XML Schema mapping</caption>
- * <thead>
- * <tr>
- * <th scope="col">Program Element</th>
- * <th scope="col">JAXB annotation</th>
- * </tr>
- * </thead>
- * <tbody style="text-align:left">
- * <tr>
- * <th scope="row" style="vertical-align:top">Package</th>
- * <td>
- * <ul style="list-style-type:none">
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchema.html">XmlSchema</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaType.html">XmlSchemaType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlSchemaTypes.html">XmlSchemaTypes</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.html">XmlJavaTypeAdapters</a></li>
- * </ul>
- * </td>
- * </tr>
- * <tr>
- * <th scope="row" style="vertical-align:top">Class</th>
- * <td>
- * <ul style="list-style-type:none">
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorType.html">XmlAccessorType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
- * </ul>
- * </td>
- * </tr>
- * <tr>
- * <th scope="row" style="vertical-align:top">Enum type</th>
- * <td>
- * <ul style="list-style-type:none">
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlEnumValue.html">XmlEnumValue (enum constant only)</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlRootElement.html">XmlRootElement</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlType.html">XmlType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
- * </ul>
- * </td>
- * </tr>
- * <tr>
- * <th scope="row" style="vertical-align:top">JavaBean Property/field</th>
- * <td>
- * <ul style="list-style-type:none">
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElements.html">XmlElements</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRef.html">XmlElementRef</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementRefs.html">XmlElementRefs</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementWrapper.html">XmlElementWrapper</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyElement.html">XmlAnyElement</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttribute.html">XmlAttribute</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAnyAttribute.html">XmlAnyAttribute</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlTransient.html">XmlTransient</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlValue.html">XmlValue</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlID.html">XmlID</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlIDREF.html">XmlIDREF</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMixed.html">XmlMixed</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlInlineBinaryData.html">XmlInlineBinaryData</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlElementDecl.html">XmlElementDecl (only on method)</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
- * </ul>
- * </td>
- * </tr>
- * <tr>
- * <th scope="row" style="vertical-align:top">Parameter</th>
- * <td>
- * <ul style="list-style-type:none">
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlAttachmentRef.html">XmlAttachmentRef</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/XmlMimeType.html">XmlMimeType</a></li>
- * <li><a HREF="../../../../javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.html">XmlJavaTypeAdapter</a></li>
- * </ul>
- * </td>
- * </tr>
- * </tbody>
- * </table>
- * <h3>Terminology</h3>
- * <p>
- * <b>JavaBean property and field:</b> For the purposes of
- * mapping, there is no semantic difference between a field and
- * a JavaBean property. Thus, an annotation that can be applied
- * to a JavaBean property can always be applied to a
- * field. Hence in the Javadoc documentation, for brevity, the
- * term JavaBean property or property is used to mean either JavaBean
- * property or a field. Where required, both are explicitly
- * mentioned.
- * <p>
- * <b>top level class:</b> For the purpose of mapping, there is
- * no semantic difference between a top level class and a
- * static nested class. Thus, an annotation that can be applied
- * to a top level class, can always be applied to a nested
- * static class. Hence in the Javadoc documentation, for
- * brevity, the term "top level class" or just class is used to
- * mean either a top level class or a nested static
- * class.
- * <p>
- * <b>mapping annotation:</b>A JAXB 2.0 defined program
- * annotation based on the JSR 175 programming annotation
- * facility.
- * <h3>Common Usage Constraints</h3>
- * <p>The following usage constraints are defined here since
- * they apply to more than annotation:
- * <ul>
- * <li> For a property, a given annotation can be applied to
- * either read or write property but not both. </li>
- * <li> A property name must be different from any other
- * property name in any of the super classes of the
- * class being mapped. </li>
- * <li> A mapped field name or the decapitalized name of a
- * mapped property must be unique within a class. </li>
- * </ul>
- * <h3>Notations</h3>
- * <b>Namespace prefixes</b>
- * <p>The following namespace prefixes are used in the XML Schema
- * fragments in this package.
- * <p>
- * <table class="striped">
- * <caption>XML Schema fragments namespace prefixes</caption>
- * <thead>
- * <tr>
- * <th scope="col">Prefix</th>
- * <th scope="col">Namespace</th>
- * <th scope="col">Notes</th>
- * </tr>
- * </thead>
- * <tbody>
- * <tr>
- * <th scope="row">xs</th>
- * <td>http://www.w3.org/2001/XMLSchema</td>
- * <td>Namespace of XML Schema namespace</td>
- * </tr>
- * <tr>
- * <th scope="row">ref</th>
- * <td>http://ws-i.org/profiles/basic/1.1/xsd</td>
- * <td>Namespace for swaref schema component</td>
- * </tr>
- * <tr>
- * <th scope="row">xsi</th>
- * <td>http://www.w3.org/2001/XMLSchema-instance</td>
- * <td>XML Schema namespace for instances</td>
- * </tr>
- * </tbody>
- * </table>
- *
- * @since 1.6, JAXB 2.0
- */
-package javax.xml.bind.annotation;
diff --git a/jaxb-api/src/main/java/module-info.java b/jaxb-api/src/main/java/module-info.java
index 0bc7f6e47208fc29087126dcc1971830fa76a208..938c7bee591122c611e3304509798d0362cd20e9 100644
--- a/jaxb-api/src/main/java/module-info.java
+++ b/jaxb-api/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2019 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
@@ -20,12 +20,12 @@ module java.xml.bind {
requires java.logging;
requires java.desktop;
- exports javax.xml.bind;
- exports javax.xml.bind.annotation;
- exports javax.xml.bind.annotation.adapters;
- exports javax.xml.bind.attachment;
- exports javax.xml.bind.helpers;
- exports javax.xml.bind.util;
+ exports jakarta.xml.bind;
+ exports jakarta.xml.bind.annotation;
+ exports jakarta.xml.bind.annotation.adapters;
+ exports jakarta.xml.bind.attachment;
+ exports jakarta.xml.bind.helpers;
+ exports jakarta.xml.bind.util;
- uses javax.xml.bind.JAXBContextFactory;
+ uses jakarta.xml.bind.JAXBContextFactory;
}
diff --git a/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java b/jaxb-api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
similarity index 97%
rename from jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
rename to jaxb-api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
index 593938ccfec76c85989445ea97c1a379aabd14ab..150a6dfcce546d61a9f744c09bfad7ae4c8c2587 100644
--- a/jaxb-api/src/main/mr-jar/javax/xml/bind/ModuleUtil.java
+++ b/jaxb-api/src/main/mr-jar/jakarta/xml/bind/ModuleUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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;
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
*/
class ModuleUtil {
- private static Logger logger = Logger.getLogger("javax.xml.bind");
+ private static Logger logger = Logger.getLogger("jakarta.xml.bind");
/**
* JAXB-RI default context factory.
diff --git a/jaxb-api/src/main/resources/javax/xml/bind/Messages.properties b/jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties
similarity index 96%
rename from jaxb-api/src/main/resources/javax/xml/bind/Messages.properties
rename to jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties
index 4a2ff60af05c883b419b2de32a8d3afcf44632cb..60f7aa5532f36509ef775aa39b4f6f69506d059c 100644
--- a/jaxb-api/src/main/resources/javax/xml/bind/Messages.properties
+++ b/jaxb-api/src/main/resources/jakarta/xml/bind/Messages.properties
@@ -1,5 +1,5 @@
#
-# 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
diff --git a/jaxb-api/src/main/resources/javax/xml/bind/helpers/Messages.properties b/jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
similarity index 94%
rename from jaxb-api/src/main/resources/javax/xml/bind/helpers/Messages.properties
rename to jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
index 83b1821b2cc947239f6f1dfb759df85bafb09e02..695f34e746952184b01faa204247191ab53c1aef 100644
--- a/jaxb-api/src/main/resources/javax/xml/bind/helpers/Messages.properties
+++ b/jaxb-api/src/main/resources/jakarta/xml/bind/helpers/Messages.properties
@@ -1,5 +1,5 @@
#
-# 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
diff --git a/jaxb-api/src/main/resources/javax/xml/bind/util/Messages.properties b/jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties
similarity index 91%
rename from jaxb-api/src/main/resources/javax/xml/bind/util/Messages.properties
rename to jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties
index 78cf4550c9332923739278f86f77c87176db6eab..069cdb865660e6debf57f42175072a534fa48e1d 100644
--- a/jaxb-api/src/main/resources/javax/xml/bind/util/Messages.properties
+++ b/jaxb-api/src/main/resources/jakarta/xml/bind/util/Messages.properties
@@ -1,5 +1,5 @@
#
-# 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