# HG changeset patch
# User alanb
# Date 1420552557 0
# Node ID a488a4a4682466c1b680cf5f59e47a468eeab8b3
# Parent 311410db7ee3377023de772e1367ba75008639c8
8047776: Add module java.transaction to export API javax.transaction
Reviewed-by: lancea, mchung
diff -r 311410db7ee3 -r a488a4a46824 common/bin/unshuffle_list.txt
--- a/common/bin/unshuffle_list.txt Tue Jan 06 13:26:58 2015 +0000
+++ b/common/bin/unshuffle_list.txt Tue Jan 06 13:55:57 2015 +0000
@@ -26,10 +26,8 @@
corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl
corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity
corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi
-corba/src/java.corba/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg
corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba
-corba/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop
jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime
jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal
@@ -1245,6 +1243,8 @@
jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset
jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql
jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql
+jdk/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
+jdk/src/java.transaction/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security
jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto
jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal
diff -r 311410db7ee3 -r a488a4a46824 modules.xml
--- a/modules.xml Tue Jan 06 13:26:58 2015 +0000
+++ b/modules.xml Tue Jan 06 13:55:57 2015 +0000
@@ -482,6 +482,7 @@
java.logging
java.naming
java.rmi
+ java.transaction
javax.activity
@@ -492,9 +493,6 @@
javax.rmi.CORBA
- javax.transaction
-
-
org.omg.CORBA
@@ -888,6 +886,7 @@
java.compact3
java.corba
java.desktop
+ java.transaction
java.xml.bind
java.xml.ws
@@ -981,6 +980,14 @@
+ java.transaction
+ java.base
+ java.rmi
+
+ javax.transaction
+
+
+
java.xml
java.base