# HG changeset patch
# User alanb
# Date 1420550818 0
# Node ID 311410db7ee3377023de772e1367ba75008639c8
# Parent bfc24ae2b900187585079bb11e66e459d1e525fe
8067867: Subsume module java.xml.soap into module java.xml.ws
Reviewed-by: mkos, mchung
diff -r bfc24ae2b900 -r 311410db7ee3 common/bin/unshuffle_list.txt
--- a/common/bin/unshuffle_list.txt Wed Jul 05 20:13:25 2017 +0200
+++ b/common/bin/unshuffle_list.txt Tue Jan 06 13:26:58 2015 +0000
@@ -66,8 +66,8 @@
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org
jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2
jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind
-jaxws/src/java.xml.soap/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
-jaxws/src/java.xml.soap/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
+jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
+jaxws/src/java.xml.ws/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal
jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal
jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish
diff -r bfc24ae2b900 -r 311410db7ee3 modules.xml
--- a/modules.xml Wed Jul 05 20:13:25 2017 +0200
+++ b/modules.xml Tue Jan 06 13:26:58 2015 +0000
@@ -889,7 +889,6 @@
java.corba
java.desktop
java.xml.bind
- java.xml.soap
java.xml.ws
@@ -1056,17 +1055,17 @@
org.xml.sax.helpers
-
- com.sun.org.apache.xerces.internal.dom
- java.xml.soap
-
-
- com.sun.org.apache.xerces.internal.jaxp
- java.xml.soap
-
-
- com.sun.org.apache.xerces.internal.util
- java.xml.soap
+
+ com.sun.org.apache.xerces.internal.dom
+ java.xml.ws
+
+
+ com.sun.org.apache.xerces.internal.jaxp
+ java.xml.ws
+
+
+ com.sun.org.apache.xerces.internal.util
+ java.xml.ws
com.sun.org.apache.xml.internal.dtm
@@ -1262,17 +1261,14 @@
com.sun.xml.internal.org.jvnet.mimepull
- java.xml.soap
java.xml.ws
com.sun.xml.internal.org.jvnet.staxex
- java.xml.soap
java.xml.ws
com.sun.xml.internal.org.jvnet.staxex.util
- java.xml.soap
java.xml.ws
@@ -1319,29 +1315,16 @@
- java.xml.soap
- java.activation
- java.base
- java.desktop
- java.logging
- java.xml
- java.xml.bind
-
- javax.xml.soap
-
-
-
java.xml.ws
- java.activation
java.annotations.common
java.base
java.desktop
java.logging
java.management
java.rmi
+ java.activation
java.xml
java.xml.bind
- java.xml.soap
jdk.httpserver
javax.jws
@@ -1350,6 +1333,9 @@
javax.jws.soap
+ javax.xml.soap
+
+
javax.xml.ws