You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/07/22 12:17:38 UTC
[tomcat] branch master updated: Complete javax -> jakarta rename.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f5efdad Complete javax -> jakarta rename.
f5efdad is described below
commit f5efdadaf9c468c452dbee99831b20021f37495c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 22 13:17:23 2020 +0100
Complete javax -> jakarta rename.
---
build.xml | 7 ----
java/{javax => jakarta}/xml/ws/WebServiceRef.java | 4 +--
java/{javax => jakarta}/xml/ws/WebServiceRefs.java | 4 +--
.../catalina/core/DefaultInstanceManager.java | 4 +--
res/checkstyle/javax-checkstyle.xml | 37 ----------------------
res/checkstyle/javax-import-control.xml | 27 ----------------
res/checkstyle/org-import-control.xml | 1 +
webapps/docs/changelog.xml | 11 +++++--
8 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/build.xml b/build.xml
index e312594..cf79946 100644
--- a/build.xml
+++ b/build.xml
@@ -624,12 +624,6 @@
<include name="**/*.java"/>
</fileset>
</checkstyle>
- <!-- javax package checks -->
- <checkstyle config="res/checkstyle/javax-checkstyle.xml">
- <fileset dir="java/javax" >
- <include name="**/*.java"/>
- </fileset>
- </checkstyle>
<!-- org package checks -->
<checkstyle config="res/checkstyle/org-checkstyle.xml">
<fileset dir="java/org" >
@@ -1502,7 +1496,6 @@
<classpath refid="tomcat.test.classpath" />
<include name="org/apache/**" />
<include name="jakarta/**" />
- <include name="javax/**" />
<include name="util/**" />
<!-- Exclude these by default as Gump can't run them because the -->
<!-- classes on which they depend are not in any output JAR. -->
diff --git a/java/javax/xml/ws/WebServiceRef.java b/java/jakarta/xml/ws/WebServiceRef.java
similarity index 98%
rename from java/javax/xml/ws/WebServiceRef.java
rename to java/jakarta/xml/ws/WebServiceRef.java
index 28b150e..d90a037 100644
--- a/java/javax/xml/ws/WebServiceRef.java
+++ b/java/jakarta/xml/ws/WebServiceRef.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-package javax.xml.ws;
+package jakarta.xml.ws;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/xml/ws/WebServiceRefs.java b/java/jakarta/xml/ws/WebServiceRefs.java
similarity index 97%
rename from java/javax/xml/ws/WebServiceRefs.java
rename to java/jakarta/xml/ws/WebServiceRefs.java
index e4f428c..f15f98a 100644
--- a/java/javax/xml/ws/WebServiceRefs.java
+++ b/java/jakarta/xml/ws/WebServiceRefs.java
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
-package javax.xml.ws;
+package jakarta.xml.ws;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index efeb968..bf2993b 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -37,7 +37,6 @@ import java.util.Set;
import javax.naming.Context;
import javax.naming.NamingException;
-import javax.xml.ws.WebServiceRef;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
@@ -45,6 +44,7 @@ import jakarta.annotation.Resource;
import jakarta.ejb.EJB;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.PersistenceUnit;
+import jakarta.xml.ws.WebServiceRef;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Globals;
@@ -91,7 +91,7 @@ public class DefaultInstanceManager implements InstanceManager {
clazz = null;
try {
- clazz = Class.forName("javax.xml.ws.WebServiceRef");
+ clazz = Class.forName("jakarta.xml.ws.WebServiceRef");
} catch (ClassNotFoundException cnfe) {
// Expected
}
diff --git a/res/checkstyle/javax-checkstyle.xml b/res/checkstyle/javax-checkstyle.xml
deleted file mode 100644
index bb7568c..0000000
--- a/res/checkstyle/javax-checkstyle.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
- <!-- When adding checks, keep to the order checks are listed under -->
- <!-- 'Standard Checks' in the Checkstyle documentation: -->
- <!-- http://checkstyle.sourceforge.net/config_coding.html -->
-
- <!-- Cache what has passed checkstyle -->
- <property name="cacheFile"
- value="${tomcat.output}/res/checkstyle/cachefile-javax-checkstyle.xml"/>
-
- <!-- Specific checks for javax.* packages -->
-
- <module name="TreeWalker">
- <module name="ImportControl">
- <property name="file" value="${basedir}/res/checkstyle/javax-import-control.xml"/>
- </module>
- </module>
-</module>
diff --git a/res/checkstyle/javax-import-control.xml b/res/checkstyle/javax-import-control.xml
deleted file mode 100644
index 5f6e23f..0000000
--- a/res/checkstyle/javax-import-control.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE import-control PUBLIC
- "-//Puppy Crawl//DTD Import Control 1.1//EN"
- "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
-
-<import-control pkg="javax">
- <allow pkg="java"/>
- <subpackage name="xml.ws">
- <allow pkg="javax.xwl.ws"/>
- </subpackage>
-</import-control>
\ No newline at end of file
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index e35985c..fc69cef 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -42,6 +42,7 @@
<allow pkg="jakarta.ejb"/>
<allow pkg="jakarta.persistence"/>
<allow pkg="jakarta.servlet"/>
+ <allow pkg="jakarta.xml.ws"/>
<allow pkg="org.apache.catalina"/>
<disallow pkg="org.apache.catalina.ha"/>
<disallow pkg="org.apache.catalina.tribes"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1585d5a..246c2c4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,9 +120,14 @@
packages. (markt)
</fix>
<fix>
- Remove the local copy of <code>javax.transaction.xa</code> package which
- is only used during compilation. The package is provided by the JRE from
- Java 1.4 onwards so the local copy should be unnecessary. (markt)
+ Remove the local copy of the <code>javax.transaction.xa</code> package
+ which is only used during compilation. The package is provided by the
+ JRE from Java 1.4 onwards so the local copy should be unnecessary.
+ (markt)
+ </fix>
+ <fix>
+ Rename the local copy of the <code>javax.xml.ws</code> package to
+ <code>jakarta.xml.ws</code>. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org