[JBWS-4378]:Replace javax.ee modules with jakarta ee modules

jbossws · Aug 14, 2023 · 1ecb6c3 · 1ecb6c3
1 parent 543970e
commit 1ecb6c3
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 75 deletions.
diff --git a/...e-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml b/...e-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
@@ -31,8 +31,7 @@
     </resources>
 
     <dependencies>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
-        <module name="javax.xml.bind.api"/>
+        <module name="jakarta.xml.bind.api"/>
         <module name="com.sun.xml.bind" services="import"/>
         <module name="org.apache.commons.logging"/>
         <module name="org.apache.commons.beanutils"/>

diff --git a/...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml b/...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
@@ -29,8 +29,8 @@
     </resources>
 
     <dependencies>
-        <module name="javax.xml.soap.api"/>
-        <module name="javax.xml.ws.api"/>
+        <module name="jakarta.xml.soap.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.modules"/>
         <module name="org.jboss.ws.jaxws-client" services="import"/>

diff --git a/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml b/...re-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
@@ -35,18 +35,14 @@
     <dependencies>
         <module name="java.management"/>
         <module name="java.naming"/>
-        <module name="javax.annotation.api"/>
-        <module name="javax.xml.stream.api"/>
-        <module name="javax.jws.api"/>
-        <module name="javax.servlet.api"/>
+        <module name="java.xml"/>
+        <module name="jakarta.annotation.api"/>
+        <module name="jakarta.servlet.api"/>
         <module name="javax.wsdl4j.api" />
-        <module name="javax.xml.ws.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="org.jboss.ws.api"/>
         <module name="org.jboss.ws.spi"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.jaxbintros"/>
-        <!-- Not supported and the API is not provided in an EE 9 server -->
-        <module name="javax.xml.rpc.api" optional="true"/>
-        <module name="java.xml"/>
     </dependencies>
 </module>
diff --git a/.../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/.../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
@@ -26,24 +26,23 @@
 
     <dependencies>
         <!-- JAXB API + REF IMPL -->
-        <module name="javax.xml.bind.api" export="true"/>
+        <module name="jakarta.xml.bind.api" export="true"/>
         <module name="org.glassfish.jaxb" export="true" services="export"/>
-        <module name="javax.xml.ws.api" export="true"/>
-        <module name="javax.jws.api" export="true"/>
+        <module name="jakarta.xml.ws.api" export="true"/>
         <!-- WSDL4J API -->
         <module name="javax.wsdl4j.api" export="true"/>
         <!-- JBossWS API -->
-        <module name="org.jboss.ws.api" export="true"/>
+        <module name="org.jboss.ws.api" export="true" />
         <!--  JBossWS JAXWS client -->
-        <module name="org.jboss.ws.jaxws-client" export="true" services="export"/>
+        <module name="org.jboss.ws.jaxws-client" export="true" services="export" />
         <!--  JBossWS configuration of Apache CXF -->
-        <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export"/>
+        <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
         <!-- Apache CXF APIs only -->
-        <module name="org.apache.cxf" export="true"/>
-        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export"/>
-        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export"/>
+        <module name="org.apache.cxf" export="true" />
+        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export" />
+        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
         <module name="org.jboss.jaxbintros" export="true"/>
-        <module name="javax.security.auth.message.api" export="true"/>
+        <module name="jakarta.security.auth.message.api" export="true"/>
         <module name="org.apache.ws.security" export="true"/>
         <module name="org.eclipse.angus.activation" export="true" services="export"/>
         <!-- Tools support on JDK 9 and later -->

diff --git a/.../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/.../resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
@@ -35,13 +35,12 @@
     <dependencies>
         <module name="java.logging"/>
         <module name="java.management"/>
-        <module name="javax.security.auth.message.api"/>
-        <module name="javax.servlet.api" />
-        <module name="javax.jws.api" />
+        <module name="java.xml"/>
+        <module name="jakarta.security.auth.message.api"/>
+        <module name="jakarta.servlet.api" />
         <module name="javax.wsdl4j.api" />
-        <module name="javax.xml.bind.api" />
-        <module name="javax.xml.stream.api" />
-        <module name="javax.xml.ws.api" />
+        <module name="jakarta.xml.bind.api" />
+        <module name="jakarta.xml.ws.api" />
         <module name="org.apache.commons.codec" />
         <module name="org.jboss.ws.api" />
         <module name="org.jboss.ws.spi" />
@@ -50,26 +49,25 @@
         <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
         <!-- do not import services from cxf, those need to come from jbossws -->
         <module name="org.apache.cxf.impl">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.jboss.logging" />
         <module name="org.apache.ws.security" />
         <module name="org.wildfly.security.elytron" />
-        <module name="java.xml"/>
     </dependencies>
 </module>
diff --git a/...es/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml b/...es/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
@@ -34,14 +34,14 @@
 
     <dependencies>
         <module name="java.logging"/>
-        <module name="javax.annotation.api"/>
+        <module name="jakarta.annotation.api"/>
         <module name="org.jboss.logging"/>
-        <module name="javax.xml.ws.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="org.apache.cxf.impl" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
     </dependencies>
 </module>
diff --git a/...dules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml b/...dules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
@@ -37,14 +37,14 @@
         <module name="org.jboss.ws.spi"/>
         <module name="org.jboss.ws.common"/>
         <module name="org.jboss.logging"/>
-        <module name="javax.annotation.api"/>
-        <module name="javax.xml.ws.api"/>
+        <module name="jakarta.annotation.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="org.jboss.ws.jaxws-undertow-httpspi"/>
         <module name="org.apache.cxf.impl" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="io.undertow.core"/>
     </dependencies>

diff --git a/...k/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/...k/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
@@ -36,36 +36,36 @@
         <module name="java.compiler"/>
         <module name="java.management"/>
         <module name="java.naming"/>
-        <module name="javax.servlet.api" />
-        <module name="javax.xml.bind.api" />
-        <module name="javax.security.auth.message.api"/>
+        <module name="jakarta.servlet.api" />
+        <module name="jakarta.xml.bind.api" />
+        <module name="jakarta.security.auth.message.api"/>
         <module name="com.sun.xml.bind" services="import"/>
-        <module name="javax.xml.ws.api" />
+        <module name="jakarta.xml.ws.api" />
         <module name="org.jboss.ws.api" />
         <module name="org.jboss.ws.spi" />
         <module name="org.jboss.ws.common" />
         <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
         <!-- do not import services from cxf, those need to come from jbossws -->
         <module name="org.apache.cxf.impl">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
-          <imports>
-            <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
-            <include path="META-INF"/>
-          </imports>
+            <imports>
+                <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
+                <include path="META-INF"/>
+            </imports>
         </module>
         <module name="org.apache.neethi" />
-        <module name="org.apache.ws.security"/>
+        <module name="org.apache.ws.security" />
         <module name="org.jboss.logging" />
         <module name="org.apache.commons.beanutils"/>
         <module name="javax.wsdl4j.api" />

diff --git a/.../resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml b/.../resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
@@ -33,7 +33,7 @@
     </resources>
 
     <dependencies>
-        <module name="javax.xml.ws.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="io.undertow.core"/>
     </dependencies>
 </module>
diff --git a/...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml b/...ature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
@@ -34,12 +34,11 @@
 
     <dependencies>
         <module name="java.management"/>
-        <module name="javax.servlet.api"/>
-        <module name="javax.xml.stream.api"/>
-        <module name="javax.xml.ws.api"/>
+        <module name="java.xml"/>
+        <module name="jakarta.servlet.api"/>
+        <module name="jakarta.xml.ws.api"/>
         <module name="org.jboss.logging"/>
         <module name="org.jboss.ws.api"/>
         <module name="org.jboss.as.webservices"/>
-        <module name="java.xml"/>
     </dependencies>
 </module>