[SCM] jigsaw packaging branch, master, updated. 04142577728d2c1b12379bb4420695cfb14a5323

[Guillaume Mazoyer]

The following commit has been merged in the master branch:
commit 04142577728d2c1b12379bb4420695cfb14a5323
Author: Alan Bateman <alan.bateman at oracle.com>
Date:   Sun Oct 30 23:39:33 2011 +0100

    Sync with the latest Jigsaw changes.

diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index e3d0e84..6412cf7 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba 4866
-cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba default
+960eb03d12700845bef706069fdfa642923af449 4867
+960eb03d12700845bef706069fdfa642923af449 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 801a8a7..e6cccfe 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 7b9585a..2badd11 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index bccfc33..514ccf2 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 632a3b6..2507d3a 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 4352e7a..dd3975f 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index d5901dd..ce79a36 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i b/jdk/.hg/store/data/make/modules/modules.group.i
index 61f0689..68ba5a8 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/modules/optional.depconfig.i b/jdk/.hg/store/data/make/modules/optional.depconfig.i
index 8c8d6ee..430bf5f 100644
Binary files a/jdk/.hg/store/data/make/modules/optional.depconfig.i and b/jdk/.hg/store/data/make/modules/optional.depconfig.i differ
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index bd2040b..c62ecc3 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index 421e889..ba0306f 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4708
+4867
 pull
 http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index e7ab5d6..801a8a7 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index c06423b..324bade 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -631,8 +631,14 @@ module jdbc-odbc {
     include META-INF/services/java.sql.Driver;
 }
 
+// JDBC 4.1, JSR 221
 module jdbc {
-    include java.sql.**, javax.sql.**;
+    include java.sql.**, javax.sql.*;
+}
+
+// JDBC Rowset interface, JSR 114
+module jdbc-rowset {
+    include javax.sql.rowset.**;
     include com.sun.rowset.**;
 }
 
diff --git a/jdk/make/modules/modules.group b/jdk/make/modules/modules.group
index 6dd06b8..f785de8 100644
--- a/jdk/make/modules/modules.group
+++ b/jdk/make/modules/modules.group
@@ -160,6 +160,11 @@ module sun.jdbc {
     include jdbc;
 }
 
+module sun.jdbc.rowset {
+    requires local jdk.boot;
+    include jdbc-rowset;
+}
+
 module sun.compat {
     requires local jdk.boot;   // ensure loaded by bootstrap class loader
     include private-legacy;
diff --git a/jdk/make/modules/optional.depconfig b/jdk/make/modules/optional.depconfig
index 65aa09c..652ce11 100644
--- a/jdk/make/modules/optional.depconfig
+++ b/jdk/make/modules/optional.depconfig
@@ -147,3 +147,23 @@
 @Optional
   java.lang.System -> java.nio.channels.Channel
   java.lang.System -> java.nio.channels.spi.SelectorProvider
+
+# public javax.xml.transform.Source getSource(java.lang.Class)
+ at Optional
+  java.sql.SQLXML -> javax.xml.transform.Source
+
+# public javax.xml.transform.Result setResult(java.lang.Class)
+ at Optional
+  java.sql.SQLXML -> javax.xml.transform.Result
+ 
+# public java.util.logging.Logger getParentLogger() 
+ at Optional
+  java.sql.Driver -> java.util.logging.Logger
+
+# public java.util.logging.Logger getParentLogger()
+ at Optional
+  javax.sql.CommonDataSource -> java.util.logging.Logger
+
+# public javax.transaction.xa.XAResource getXAResource()
+ at Optional
+  javax.sql.XAConnection -> javax.transaction.xa.XAResource 

-- 
jigsaw packaging