stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8197533: Move javax.transaction.xa to its own module

Browse Source 
Reviewed-by: darcy, alanb, psandoz, ihse
This commit is contained in:
Lance Andersen 2018-03-04 17:05:29 -05:00
parent d4d8c255b2
commit 9995861868
18 changed files with 129 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/CompileJavaModules.gmk
View File

@ -252,6 +252,10 @@ java.prefs_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,
################################################################################
java.transaction.xa_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
################################################################################
java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS

1
make/common/Modules.gmk
View File

@ -94,6 +94,7 @@ PLATFORM_MODULES += \
java.smartcardio \
java.sql \
java.sql.rowset \
java.transaction.xa \
java.xml.crypto \
jdk.accessibility \
jdk.charsets \

1
make/jdk/src/classes/build/tools/jigsaw/GenGraphs.java
View File

@ -142,6 +142,7 @@ public class GenGraphs {
ranks.add(Set.of("java.logging", "java.scripting", "java.xml"));
ranks.add(Set.of("java.sql"));
ranks.add(Set.of("java.transaction.xa"));
ranks.add(Set.of("java.compiler", "java.instrument"));
ranks.add(Set.of("java.desktop", "java.management"));

10
make/jdk/src/classes/build/tools/jigsaw/technology-summary.html
View File

@ -20,8 +20,8 @@ td.agg { background-color: lightgray; }
<table>
<tr><th>Legend</th></tr>
<tr class="se-base"><td><a href="https://jcp.org/en/jsr/platform?listBy=2&listByType=platform">JCP technology in the Java SE Platform only -- in java.base</a></td></tr>
<tr class="se-misc"><td><a href="https://jcp.org/en/jsr/platform?listBy=2&listByType=platform">JCP technology in the Java SE Platform only -- not in java.base</a></td></tr>
<tr class="se-base"><td><a href="https://jcp.org/en/jsr/platform?listBy=2&listByType=platform">JCP technology in the Java SE Platform -- in java.base</a></td></tr>
<tr class="se-misc"><td><a href="https://jcp.org/en/jsr/platform?listBy=2&listByType=platform">JCP technology in the Java SE Platform -- not in java.base</a></td></tr>
<tr class="se-ext"><td><a href="http://docs.oracle.com/javase/8/docs/technotes/guides/standards/#endorsed-standards-apis">JCP technology in the Java SE Platform derived from non-JCP standards</a></a></td></tr>
<tr class="non-se"><td>JCP technology not included in the Java SE Platform</td></tr>
</table>
@ -402,10 +402,10 @@ td.agg { background-color: lightgray; }
<td></td>
</tr>
<tr class="se-misc">
<td><a href="https://jcp.org/en/jsr/detail?id=907">907</a></td>
<td>---</td>
<td>JTA (XA)</td>
<td>Original JSR</td>
<td><a href="module-summary.html#java.sql">java.sql</a></td>
<td>UJSR for Java SE</td>
<td><a href="module-summary.html#java.transaction.xa">java.transaction.xa</a></td>
<td>plat</td>
<td>No</td>
<td>Formerly a <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/standards/#standalone-technologies">Standalone Technology</a> (unlisted)</td>

1
src/java.se/share/classes/module-info.java
View File

@ -55,6 +55,7 @@ module java.se {
requires transitive java.security.sasl;
requires transitive java.sql;
requires transitive java.sql.rowset;
requires transitive java.transaction.xa;
requires transitive java.xml;
requires transitive java.xml.crypto;
}

41
src/java.sql/share/classes/javax/transaction/xa/package.html
View File

@ -1,41 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
<!--
Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 only, as
published by the Free Software Foundation. Oracle designates this
particular file as subject to the "Classpath" exception as provided
by Oracle in the LICENSE file that accompanied this code.
This code is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
version 2 for more details (a copy is included in the LICENSE file that
accompanied this code).
You should have received a copy of the GNU General Public License version
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
or visit www.oracle.com if you need additional information or have any
questions.
-->
</head>
<body bgcolor="white">
Provides the API that defines the contract between the transaction
manager and the resource manager, which allows the transaction
manager to enlist and delist resource objects (supplied by the
resource manager driver) in JTA transactions. The driver vendor
for a specific resource manager provides the implementation of
this API.
@since 1.4
</body>
</html>

4
src/java.sql/share/classes/module-info.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,11 +33,11 @@
*/
module java.sql {
requires transitive java.logging;
requires transitive java.transaction.xa;
requires transitive java.xml;
exports java.sql;
exports javax.sql;
exports javax.transaction.xa;
uses java.sql.Driver;
}

0
src/java.sql/share/classes/javax/transaction/xa/XAException.java → src/java.transaction.xa/share/classes/javax/transaction/xa/XAException.java
View File

0
src/java.sql/share/classes/javax/transaction/xa/XAResource.java → src/java.transaction.xa/share/classes/javax/transaction/xa/XAResource.java
View File

0
src/java.sql/share/classes/javax/transaction/xa/Xid.java → src/java.transaction.xa/share/classes/javax/transaction/xa/Xid.java
View File

36
src/java.transaction.xa/share/classes/javax/transaction/xa/package-info.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* Provides the API that defines the contract between the transaction manager
* and the resource manager, which allows the transaction manager to enlist
* and delist resource objects (supplied by the resource manager driver) in
* JTA transactions. The driver vendor for a specific resource manager provides
* the implementation of this API.
*
* @since 1.4
*/
package javax.transaction.xa;

36
src/java.transaction.xa/share/classes/module-info.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* Defines an API for supporting distributed transactions in JDBC.
*
* @moduleGraph
* @since 11
*/
module java.transaction.xa {
exports javax.transaction.xa;
}

1
test/jdk/TEST.groups
View File

@ -264,6 +264,7 @@ jdk_tools = \
jdk_other = \
java/sql \
javax/sql \
javax/transaction \
javax/rmi \
javax/naming \
javax/script \

8
test/jdk/javax/transaction/testng/Driver.java → test/jdk/javax/transaction/xa/testng/Driver.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2918, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,9 +23,11 @@
/**
* @test
* @modules java.sql
* @modules java.transaction.xa
* @compile
* test/transaction/XAExceptionTests.java
* util/SerializedTransactionExceptions.java
* @run testng/othervm test.transaction.XAExceptionTests
* @run testng/othervm Driver
*/
public class Driver extends test.transaction.XAExceptionTests {
}

33
test/jdk/javax/transaction/xa/testng/JavaSqlModuleDriver.java Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @modules java.sql
* @compile
* test/transaction/XAExceptionTests.java
* util/SerializedTransactionExceptions.java
* @run testng/othervm JavaSqlModuleDriver
*/
public class JavaSqlModuleDriver extends test.transaction.XAExceptionTests {
}

0
test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java → test/jdk/javax/transaction/xa/testng/test/transaction/XAExceptionTests.java
View File

0
test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java → test/jdk/javax/transaction/xa/testng/util/SerializedTransactionExceptions.java
View File

4
test/langtools/tools/jdeps/modules/DotFileTest.java
View File

@ -64,7 +64,9 @@ public class DotFileTest {
"java.xml -> java.base" )
},
{ "java.sql", Set.of("java.logging -> java.base",
"java.transaction.xa -> java.base",
"java.sql -> java.logging",
"java.sql -> java.transaction.xa",
"java.sql -> java.xml",
"java.xml -> java.base" )
}
@ -79,7 +81,9 @@ public class DotFileTest {
"java.xml -> java.base")
},
{ "java.sql", Set.of("java.logging -> java.base",
"java.transaction.xa -> java.base",
"java.sql -> java.logging",
"java.sql -> java.transaction.xa",
"java.sql -> java.xml",
"java.xml -> java.base" )
}