[tx-control] Add JPA XA support for Hibernate 5.2.x
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/tx-control@1799589 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index fe5d09a..6cc2251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,10 @@
<module>tx-control-provider-jdbc-xa</module>
<module>tx-control-provider-jpa-common</module>
<module>tx-control-provider-jpa-local</module>
+ <module>tx-control-provider-jpa-xa-plugin-eclipselink</module>
+ <module>tx-control-provider-jpa-xa-plugin-hibernate-5_0</module>
+ <module>tx-control-provider-jpa-xa-plugin-hibernate-5_2</module>
+ <module>tx-control-provider-jpa-xa-plugin-openjpa</module>
<module>tx-control-provider-jpa-xa</module>
<module>tx-control-itests</module>
<module>tx-control-jpa-itests</module>
diff --git a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_10_Test.java b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_10_Test.java
new file mode 100644
index 0000000..391e54a
--- /dev/null
+++ b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_10_Test.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.tx.control.itests;
+
+import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+
+public class SimpleHibernate_5_2_10_Test extends AbstractSimpleTransactionTest {
+
+ protected String ariesJPAVersion() {
+ return "2.4.0";
+ }
+
+ @Override
+ protected Option jpaProvider() {
+ return CoreOptions.composite(
+ // Add JTA 1.1 as a system package because of the link to javax.sql
+ // Also set javax.xml.stream to 1.0 due to hibernate's funny packaging
+
+ systemProperty(ARIES_EMF_BUILDER_TARGET_FILTER)
+ .value("(osgi.unit.provider=org.hibernate.jpa.HibernatePersistenceProvider)"),
+ systemPackage("javax.xml.stream;version=1.0"), systemPackage("javax.xml.stream.events;version=1.0"),
+ systemPackage("javax.xml.stream.util;version=1.0"), systemPackage("javax.transaction;version=1.1"),
+ systemPackage("javax.transaction.xa;version=1.1"),
+ bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec", "1.1.1"))
+ .beforeFramework(),
+
+ // Hibernate bundles and their dependencies (JPA API is available from the tx-control)
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.antlr", "2.7.7_5"),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j", "1.6.1_5"),
+ mavenBundle("com.fasterxml", "classmate", "1.3.0"),
+ mavenBundle("org.javassist", "javassist", "3.20.0-GA"),
+ mavenBundle("org.jboss.logging", "jboss-logging", "3.3.0.Final"),
+ mavenBundle("org.jboss", "jandex", "2.0.3.Final"),
+ mavenBundle("org.hibernate.common", "hibernate-commons-annotations", "5.0.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-core", "5.2.10.Final"),
+ mavenBundle("org.hibernate", "hibernate-osgi", "5.2.10.Final"));
+ }
+
+}
diff --git a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_1_Test.java b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_1_Test.java
new file mode 100644
index 0000000..bb6a419
--- /dev/null
+++ b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleHibernate_5_2_1_Test.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.tx.control.itests;
+
+import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+
+/**
+ * We test Hibernate 5.2.1, and not 5.2.0 because of Hibernate bug HHH-10807
+ */
+public class SimpleHibernate_5_2_1_Test extends AbstractSimpleTransactionTest {
+
+ protected String ariesJPAVersion() {
+ return "2.4.0";
+ }
+
+ @Override
+ protected Option jpaProvider() {
+ return CoreOptions.composite(
+ // Add JTA 1.1 as a system package because of the link to javax.sql
+ // Also set javax.xml.stream to 1.0 due to hibernate's funny packaging
+
+ systemProperty(ARIES_EMF_BUILDER_TARGET_FILTER)
+ .value("(osgi.unit.provider=org.hibernate.jpa.HibernatePersistenceProvider)"),
+ systemPackage("javax.xml.stream;version=1.0"), systemPackage("javax.xml.stream.events;version=1.0"),
+ systemPackage("javax.xml.stream.util;version=1.0"), systemPackage("javax.transaction;version=1.1"),
+ systemPackage("javax.transaction.xa;version=1.1"),
+ bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec", "1.1.1"))
+ .beforeFramework(),
+
+ // Hibernate bundles and their dependencies (JPA API is available from the tx-control)
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.antlr", "2.7.7_5"),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j", "1.6.1_5"),
+ mavenBundle("com.fasterxml", "classmate", "1.3.0"),
+ mavenBundle("org.javassist", "javassist", "3.20.0-GA"),
+ mavenBundle("org.jboss.logging", "jboss-logging", "3.3.0.Final"),
+ mavenBundle("org.jboss", "jandex", "2.0.3.Final"),
+ mavenBundle("org.hibernate.common", "hibernate-commons-annotations", "5.0.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-core", "5.2.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-osgi", "5.2.1.Final"));
+ }
+
+}
diff --git a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
index daf91d1..1fab078 100644
--- a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
+++ b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
@@ -19,9 +19,7 @@
package org.apache.aries.tx.control.itests;
import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
-import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.repository;
import static org.ops4j.pax.exam.CoreOptions.systemPackage;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
@@ -31,11 +29,7 @@
public class XAHibernate_5_0_9_Test extends XAJPATransactionTest {
protected Option ariesJPAVersion() {
- return composite(
- repository("https://repository.apache.org/content/repositories/snapshots/")
- .allowSnapshots().disableReleases().id("Apache Snapshots"),
- mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container", "2.5.0-SNAPSHOT")
- );
+ return mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container", "2.5.0");
}
@Override
diff --git a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_10_Test.java b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_10_Test.java
new file mode 100644
index 0000000..bcc6161
--- /dev/null
+++ b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_10_Test.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.tx.control.itests;
+
+import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+
+public class XAHibernate_5_2_10_Test extends XAJPATransactionTest {
+
+ protected Option ariesJPAVersion() {
+ return mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container", "2.5.0");
+ }
+
+ @Override
+ protected Option jpaProvider() {
+ return CoreOptions.composite(
+ // Add JTA 1.1 as a system package because of the link to javax.sql
+ // Also set javax.xml.stream to 1.0 due to hibernate's funny packaging
+
+ systemProperty(ARIES_EMF_BUILDER_TARGET_FILTER)
+ .value("(osgi.unit.provider=org.hibernate.jpa.HibernatePersistenceProvider)"),
+ systemPackage("javax.xml.stream;version=1.0"),
+ systemPackage("javax.xml.stream.events;version=1.0"),
+ systemPackage("javax.xml.stream.util;version=1.0"),
+ systemPackage("javax.transaction;version=1.1"),
+ systemPackage("javax.transaction.xa;version=1.1"),
+ bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec", "1.1.1")).beforeFramework(),
+
+ // Hibernate bundles and their dependencies (JPA API is available from the tx-control)
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.antlr", "2.7.7_5"),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j", "1.6.1_5"),
+ mavenBundle("com.fasterxml", "classmate", "1.3.0"),
+ mavenBundle("org.javassist", "javassist", "3.20.0-GA"),
+ mavenBundle("org.jboss.logging", "jboss-logging", "3.3.0.Final"),
+ mavenBundle("org.jboss", "jandex", "2.0.3.Final"),
+ mavenBundle("org.hibernate.common", "hibernate-commons-annotations", "5.0.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-core", "5.2.10.Final"),
+ mavenBundle("org.hibernate", "hibernate-osgi", "5.2.10.Final"));
+ }
+
+}
diff --git a/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_1_Test.java b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_1_Test.java
new file mode 100644
index 0000000..a18d1ae
--- /dev/null
+++ b/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_2_1_Test.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.tx.control.itests;
+
+import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemPackage;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+
+/**
+ * We test Hibernate 5.2.1, and not 5.2.0 because of Hibernate bug HHH-10807
+ */
+public class XAHibernate_5_2_1_Test extends XAJPATransactionTest {
+
+ protected Option ariesJPAVersion() {
+ return mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container", "2.5.0");
+ }
+
+ @Override
+ protected Option jpaProvider() {
+ return CoreOptions.composite(
+ // Add JTA 1.1 as a system package because of the link to javax.sql
+ // Also set javax.xml.stream to 1.0 due to hibernate's funny packaging
+
+ systemProperty(ARIES_EMF_BUILDER_TARGET_FILTER)
+ .value("(osgi.unit.provider=org.hibernate.jpa.HibernatePersistenceProvider)"),
+ systemPackage("javax.xml.stream;version=1.0"),
+ systemPackage("javax.xml.stream.events;version=1.0"),
+ systemPackage("javax.xml.stream.util;version=1.0"),
+ systemPackage("javax.transaction;version=1.1"),
+ systemPackage("javax.transaction.xa;version=1.1"),
+ bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec", "1.1.1")).beforeFramework(),
+
+ // Hibernate bundles and their dependencies (JPA API is available from the tx-control)
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.antlr", "2.7.7_5"),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.dom4j", "1.6.1_5"),
+ mavenBundle("com.fasterxml", "classmate", "1.3.0"),
+ mavenBundle("org.javassist", "javassist", "3.20.0-GA"),
+ mavenBundle("org.jboss.logging", "jboss-logging", "3.3.0.Final"),
+ mavenBundle("org.jboss", "jandex", "2.0.3.Final"),
+ mavenBundle("org.hibernate.common", "hibernate-commons-annotations", "5.0.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-core", "5.2.1.Final"),
+ mavenBundle("org.hibernate", "hibernate-osgi", "5.2.1.Final"));
+ }
+
+}
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/.gitignore b/tx-control-provider-jpa-xa-plugin-eclipselink/.gitignore
new file mode 100644
index 0000000..0f63015
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/bin/
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/LICENSE b/tx-control-provider-jpa-xa-plugin-eclipselink/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/NOTICE b/tx-control-provider-jpa-xa-plugin-eclipselink/NOTICE
new file mode 100644
index 0000000..424644d
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/README.md b/tx-control-provider-jpa-xa-plugin-eclipselink/README.md
new file mode 100644
index 0000000..1352872
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/README.md
@@ -0,0 +1,6 @@
+EclipseLink plugin for Aries Tx Control JPA (XA)
+------------------------------------------------
+
+This maven module provides a plugin for EclipseLink used to support XA transactions when using Transaction Control. This module must not be used in isolation, and is designed to be repackaged into the Aries Tx Control JPA (XA) provider.
+
+The Transaction Control Service (RFC-221) is an in-progress RFC publicly available from the OSGi Alliance: https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd b/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd
new file mode 100644
index 0000000..dc0b6c5
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This bundle must never resolve, it's only purpose is to be repackaged in
+# the main XA JPA provider
+Require-Capability:\
+ osgi.compile.time.only;filter:="(&(must.not.resolve=*)(!(must.not.resolve=*)))"
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-eclipselink/pom.xml b/tx-control-provider-jpa-xa-plugin-eclipselink/pom.xml
new file mode 100644
index 0000000..182d4e8
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-eclipselink</artifactId>
+ <name>EclipseLink plugin for the JPA (XA) Resource Provider</name>
+ <version>0.0.3-SNAPSHOT</version>
+
+ <description>
+ This bundle contains an EclipseLink plugin for the Aries Transaction control JPA resource provider.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink
+ </url>
+ </scm>
+
+ <dependencies>
+ <!-- Internal Aries project dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JPA Provider dependencies -->
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>org.eclipse.persistence.core</artifactId>
+ <version>2.4.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/eclipse/impl/EclipseTxControlPlatform.java b/tx-control-provider-jpa-xa-plugin-eclipselink/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/eclipse/impl/EclipseTxControlPlatform.java
similarity index 96%
rename from tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/eclipse/impl/EclipseTxControlPlatform.java
rename to tx-control-provider-jpa-xa-plugin-eclipselink/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/eclipse/impl/EclipseTxControlPlatform.java
index 85bc0b6..f856285 100644
--- a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/eclipse/impl/EclipseTxControlPlatform.java
+++ b/tx-control-provider-jpa-xa-plugin-eclipselink/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/eclipse/impl/EclipseTxControlPlatform.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.tx.control.jpa.xa.eclipse.impl;
+package org.apache.aries.tx.control.jpa.xa.plugin.eclipse.impl;
import static javax.transaction.Status.STATUS_ACTIVE;
import static javax.transaction.Status.STATUS_COMMITTED;
@@ -53,6 +53,8 @@
import org.osgi.service.transaction.control.TransactionControl;
import org.osgi.service.transaction.control.TransactionException;
import org.osgi.service.transaction.control.TransactionStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class EclipseTxControlPlatform extends ServerPlatformBase {
@@ -71,6 +73,8 @@
public static class TxControlAdapter extends AbstractTransactionController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TxControlAdapter.class);
+
/**
* This has to be static because EclipseLink doesn't allow plugins
* to be configured and passed in as instances. It is safe because
@@ -98,6 +102,7 @@
@Override
protected void registerSynchronization_impl(AbstractSynchronizationListener listener, Object txn)
throws Exception {
+ LOGGER.debug("Registering a synchronization with the current transaction");
TransactionContext ctx = ((TransactionWrapper) txn).getContext();
ctx.preCompletion(listener::beforeCompletion);
ctx.postCompletion(listener::afterCompletion);
@@ -115,7 +120,6 @@
@Override
protected Object getTransactionKey_impl(Object transaction) throws Exception {
-
return transaction == null ? null :
((TransactionWrapper) transaction).getContext().getTransactionKey();
}
@@ -143,6 +147,7 @@
@Override
protected void markTransactionForRollback_impl() throws Exception {
+ LOGGER.debug("Marking the current transaction for rollback");
getTxControl().setRollbackOnly();
}
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/.gitignore b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/.gitignore
new file mode 100644
index 0000000..0f63015
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/bin/
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/LICENSE b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/NOTICE b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/NOTICE
new file mode 100644
index 0000000..424644d
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/README.md b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/README.md
new file mode 100644
index 0000000..1c62aae
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/README.md
@@ -0,0 +1,6 @@
+Hibernate (5.0.x & 5.1.x) plugin for Aries Tx Control JPA (XA)
+--------------------------------------------------------------
+
+This maven module provides a plugin for Hibernate used to support XA transactions when using Transaction Control. This plugin supports Hibernate 5.0.x and 5.1.x. The plugin SPI was broken in Hibernate 5.2.x, so a different plugin supports those versions. This module must not be used in isolation, and is designed to be repackaged into the Aries Tx Control JPA (XA) provider.
+
+The Transaction Control Service (RFC-221) is an in-progress RFC publicly available from the OSGi Alliance: https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd
new file mode 100644
index 0000000..dc0b6c5
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This bundle must never resolve, it's only purpose is to be repackaged in
+# the main XA JPA provider
+Require-Capability:\
+ osgi.compile.time.only;filter:="(&(must.not.resolve=*)(!(must.not.resolve=*)))"
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml
new file mode 100644
index 0000000..77b13a8
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_0</artifactId>
+ <name>Hibernate (5.0.x and 5.1.x) plugin for the JPA (XA) Resource Provider</name>
+ <version>0.0.3-SNAPSHOT</version>
+
+ <description>
+ This bundle contains a Hibernate plugin for the Aries Transaction control JPA resource provider.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin--hibernate-5_0
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin--hibernate-5_0
+ </url>
+ </scm>
+
+ <dependencies>
+ <!-- Internal Aries project dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JPA Provider dependencies -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.0.0.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java
similarity index 92%
rename from tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java
rename to tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java
index 1943b8c..775b936 100644
--- a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.tx.control.jpa.xa.hibernate.impl;
+package org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl;
import static javax.transaction.Status.STATUS_COMMITTED;
import static javax.transaction.Status.STATUS_ROLLEDBACK;
@@ -50,10 +50,14 @@
import org.osgi.service.transaction.control.TransactionContext;
import org.osgi.service.transaction.control.TransactionControl;
import org.osgi.service.transaction.control.TransactionStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class HibernateTxControlPlatform implements
TransactionCoordinatorBuilder {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HibernateTxControlPlatform.class);
+
private static final long serialVersionUID = 1L;
private final ThreadLocal<TransactionControl> txControlToUse;
@@ -185,6 +189,7 @@
@Override
public void registerSynchronization(Synchronization synchronization) {
+ LOGGER.debug("Registering a synchronization with the current transaction");
TransactionContext currentContext = getTxControl().getCurrentContext();
currentContext.preCompletion(synchronization::beforeCompletion);
currentContext.postCompletion(status -> synchronization.afterCompletion(toIntStatus(status)));
@@ -291,10 +296,16 @@
}
};
- if(transacted) {
- return getTxControl().requiresNew(c);
- } else {
- return getTxControl().notSupported(c);
+ try {
+ if(transacted) {
+ LOGGER.debug("Performing a query in a nested transaction");
+ return getTxControl().requiresNew(c);
+ } else {
+ LOGGER.debug("Suspending the current transaction to run a query");
+ return getTxControl().notSupported(c);
+ }
+ } finally {
+ LOGGER.debug("The previous transaction has been resumed");
}
}
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore
new file mode 100644
index 0000000..0f63015
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/bin/
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE
new file mode 100644
index 0000000..424644d
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md
new file mode 100644
index 0000000..4aa8b86
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md
@@ -0,0 +1,6 @@
+Hibernate (5.2.x & higher) plugin for Aries Tx Control JPA (XA)
+--------------------------------------------------------------
+
+This maven module provides a plugin for Hibernate used to support XA transactions when using Transaction Control. This plugin supports Hibernate 5.2.x and above. The plugin SPI was broken in Hibernate 5.2.x, so a different plugin supports versions from 5.0 to 5.1.x. This module must not be used in isolation, and is designed to be repackaged into the Aries Tx Control JPA (XA) provider.
+
+The Transaction Control Service (RFC-221) is an in-progress RFC publicly available from the OSGi Alliance: https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd
new file mode 100644
index 0000000..dc0b6c5
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This bundle must never resolve, it's only purpose is to be repackaged in
+# the main XA JPA provider
+Require-Capability:\
+ osgi.compile.time.only;filter:="(&(must.not.resolve=*)(!(must.not.resolve=*)))"
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml
new file mode 100644
index 0000000..603da6b
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_2</artifactId>
+ <name>Hibernate (5.2.x and higher) plugin for the JPA (XA) Resource Provider</name>
+ <version>0.0.3-SNAPSHOT</version>
+
+ <description>
+ This bundle contains a Hibernate plugin for the Aries Transaction control JPA resource provider.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin--hibernate-5_2
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin--hibernate-5_2
+ </url>
+ </scm>
+
+ <dependencies>
+ <!-- Internal Aries project dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JPA Provider dependencies -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>5.2.2.Final</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java
similarity index 81%
copy from tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java
copy to tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java
index 1943b8c..9cbe49e 100644
--- a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/hibernate/impl/HibernateTxControlPlatform.java
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.tx.control.jpa.xa.hibernate.impl;
+package org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl;
import static javax.transaction.Status.STATUS_COMMITTED;
import static javax.transaction.Status.STATUS_ROLLEDBACK;
import static javax.transaction.Status.STATUS_UNKNOWN;
-import static org.hibernate.ConnectionAcquisitionMode.AS_NEEDED;
-import static org.hibernate.ConnectionReleaseMode.AFTER_STATEMENT;
import static org.osgi.service.transaction.control.TransactionStatus.COMMITTED;
import java.sql.Connection;
@@ -33,8 +31,6 @@
import javax.persistence.TransactionRequiredException;
import javax.transaction.Synchronization;
-import org.hibernate.ConnectionAcquisitionMode;
-import org.hibernate.ConnectionReleaseMode;
import org.hibernate.HibernateException;
import org.hibernate.TransactionException;
import org.hibernate.engine.transaction.spi.IsolationDelegate;
@@ -42,23 +38,33 @@
import org.hibernate.jdbc.WorkExecutor;
import org.hibernate.jdbc.WorkExecutorVisitable;
import org.hibernate.resource.jdbc.spi.JdbcSessionOwner;
-import org.hibernate.resource.transaction.SynchronizationRegistry;
-import org.hibernate.resource.transaction.TransactionCoordinator;
-import org.hibernate.resource.transaction.TransactionCoordinator.TransactionDriver;
-import org.hibernate.resource.transaction.TransactionCoordinatorBuilder;
+import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
+import org.hibernate.resource.transaction.spi.SynchronizationRegistry;
+import org.hibernate.resource.transaction.spi.TransactionCoordinator;
+import org.hibernate.resource.transaction.spi.TransactionCoordinator.TransactionDriver;
+import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder;
import org.hibernate.resource.transaction.spi.TransactionCoordinatorOwner;
import org.osgi.service.transaction.control.TransactionContext;
import org.osgi.service.transaction.control.TransactionControl;
import org.osgi.service.transaction.control.TransactionStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class HibernateTxControlPlatform implements
+/**
+ * This plugin provides support for Hibernate 5.2.0 and 5.2.1,
+ * after this Hibernate added a breaking change...
+ *
+ */
+public class Hibernate520TxControlPlatform implements
TransactionCoordinatorBuilder {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Hibernate520TxControlPlatform.class);
+
private static final long serialVersionUID = 1L;
private final ThreadLocal<TransactionControl> txControlToUse;
- public HibernateTxControlPlatform(ThreadLocal<TransactionControl> txControlToUse) {
+ public Hibernate520TxControlPlatform(ThreadLocal<TransactionControl> txControlToUse) {
this.txControlToUse = txControlToUse;
}
@@ -71,7 +77,7 @@
}
@Override
- public TransactionCoordinator buildTransactionCoordinator(TransactionCoordinatorOwner owner, TransactionCoordinatorOptions options) {
+ public TransactionCoordinator buildTransactionCoordinator(TransactionCoordinatorOwner owner, TransactionCoordinatorBuilder.Options options) {
return new HibernateTxControlCoordinator(owner, options.shouldAutoJoinTransaction());
}
@@ -81,15 +87,10 @@
}
@Override
- public ConnectionReleaseMode getDefaultConnectionReleaseMode() {
- return AFTER_STATEMENT;
+ public PhysicalConnectionHandlingMode getDefaultConnectionHandlingMode() {
+ return PhysicalConnectionHandlingMode.DELAYED_ACQUISITION_AND_RELEASE_AFTER_TRANSACTION;
}
-
- @Override
- public ConnectionAcquisitionMode getDefaultConnectionAcquisitionMode() {
- return AS_NEEDED;
- }
-
+
public class HibernateTxControlCoordinator implements TransactionCoordinator,
SynchronizationRegistry, TransactionDriver, IsolationDelegate {
@@ -170,7 +171,7 @@
@Override
public TransactionCoordinatorBuilder getTransactionCoordinatorBuilder() {
- return HibernateTxControlPlatform.this;
+ return Hibernate520TxControlPlatform.this;
}
@Override
@@ -185,6 +186,7 @@
@Override
public void registerSynchronization(Synchronization synchronization) {
+ LOGGER.debug("Registering a synchronization with the current transaction");
TransactionContext currentContext = getTxControl().getCurrentContext();
currentContext.preCompletion(synchronization::beforeCompletion);
currentContext.postCompletion(status -> synchronization.afterCompletion(toIntStatus(status)));
@@ -291,12 +293,22 @@
}
};
- if(transacted) {
- return getTxControl().requiresNew(c);
- } else {
- return getTxControl().notSupported(c);
+ return delegateCallable(c, transacted);
+ }
+
+ @Override
+ public <T> T delegateCallable(Callable<T> c, boolean transacted) throws HibernateException {
+ try {
+ if(transacted) {
+ LOGGER.debug("Performing a query in a nested transaction");
+ return getTxControl().requiresNew(c);
+ } else {
+ LOGGER.debug("Suspending the current transaction to run a query");
+ return getTxControl().notSupported(c);
+ }
+ } finally {
+ LOGGER.debug("The previous transaction has been resumed");
}
-
}
}
}
diff --git a/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java
new file mode 100644
index 0000000..1805681
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.hibernate.resource.transaction.spi.DdlTransactionIsolator;
+import org.hibernate.tool.schema.internal.exec.JdbcContext;
+import org.hibernate.tool.schema.spi.SchemaManagementException;
+import org.osgi.service.transaction.control.TransactionControl;
+
+/**
+ * This plugin provides the extra feature needed to support Hibernate
+ * 5.2.2 and above
+ *
+ */
+public class Hibernate522TxControlPlatform extends Hibernate520TxControlPlatform {
+
+ private static final long serialVersionUID = 1L;
+
+ public Hibernate522TxControlPlatform(ThreadLocal<TransactionControl> txControlToUse) {
+ super(txControlToUse);
+ }
+
+ @Override
+ public DdlTransactionIsolator buildDdlTransactionIsolator(JdbcContext jdbcContext) {
+ return new TxControlDdlTransactionIsolator(jdbcContext);
+ }
+
+ public static class TxControlDdlTransactionIsolator implements DdlTransactionIsolator {
+
+ private final JdbcContext jdbcContext;
+
+ public TxControlDdlTransactionIsolator(JdbcContext jdbcContext) {
+ this.jdbcContext = jdbcContext;
+ }
+
+ @Override
+ public Connection getIsolatedConnection() {
+ try {
+ return jdbcContext.getJdbcConnectionAccess().obtainConnection();
+ } catch (SQLException e) {
+ throw new SchemaManagementException("Unable to access the transactional connection", e );
+ }
+ }
+
+ @Override
+ public JdbcContext getJdbcContext() {
+ return jdbcContext;
+ }
+
+ @Override
+ public void prepare() { }
+
+ @Override
+ public void release() { }
+ }
+}
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore b/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore
new file mode 100644
index 0000000..0f63015
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/bin/
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE b/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE b/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE
new file mode 100644
index 0000000..424644d
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/README.md b/tx-control-provider-jpa-xa-plugin-openjpa/README.md
new file mode 100644
index 0000000..4e703dc
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/README.md
@@ -0,0 +1,6 @@
+OpenJPA plugin for Aries Tx Control JPA (XA)
+--------------------------------------------
+
+This maven module provides a plugin for OpenJPA used to support XA transactions when using Transaction Control. This module must not be used in isolation, and is designed to be repackaged into the Aries Tx Control JPA (XA) provider.
+
+The Transaction Control Service (RFC-221) is an in-progress RFC publicly available from the OSGi Alliance: https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd b/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd
new file mode 100644
index 0000000..dc0b6c5
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This bundle must never resolve, it's only purpose is to be repackaged in
+# the main XA JPA provider
+Require-Capability:\
+ osgi.compile.time.only;filter:="(&(must.not.resolve=*)(!(must.not.resolve=*)))"
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml b/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml
new file mode 100644
index 0000000..4b01d8f
--- /dev/null
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control</artifactId>
+ <version>0.0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-openjpa</artifactId>
+ <name>OpenJPA plugin for the JPA (XA) Resource Provider</name>
+ <version>0.0.3-SNAPSHOT</version>
+
+ <description>
+ This bundle contains an OpenJPA plugin for the Aries Transaction control JPA resource provider.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa
+ </url>
+ </scm>
+
+ <dependencies>
+ <!-- Internal Aries project dependencies -->
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JPA Provider dependencies -->
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-kernel</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Logging dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/openjpa/impl/OpenJPATxControlPlatform.java b/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java
similarity index 89%
rename from tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/openjpa/impl/OpenJPATxControlPlatform.java
rename to tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java
index 2597dbc..2ab9768 100644
--- a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/openjpa/impl/OpenJPATxControlPlatform.java
+++ b/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.aries.tx.control.jpa.xa.openjpa.impl;
+package org.apache.aries.tx.control.jpa.xa.plugin.openjpa.impl;
import static javax.transaction.Status.STATUS_ACTIVE;
import static javax.transaction.Status.STATUS_COMMITTED;
@@ -45,10 +45,14 @@
import org.osgi.service.transaction.control.TransactionControl;
import org.osgi.service.transaction.control.TransactionException;
import org.osgi.service.transaction.control.TransactionStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class OpenJPATxControlPlatform implements ManagedRuntime,
TransactionManager, Transaction {
+ private static final Logger LOGGER = LoggerFactory.getLogger(OpenJPATxControlPlatform.class);
+
private final ThreadLocal<TransactionControl> txControlToUse;
public OpenJPATxControlPlatform(ThreadLocal<TransactionControl> txControlToUse) {
@@ -68,11 +72,17 @@
public void doNonTransactionalWork(Runnable arg0) throws NotSupportedException {
TransactionControl transactionControl = getTxControl();
-
+ boolean activeTransaction = transactionControl.activeTransaction();
+ if(activeTransaction) {
+ LOGGER.debug("Suspending the active transaction to perform a non-transactional query");
+ }
transactionControl.notSupported(() -> {
arg0.run();
return null;
});
+ if(activeTransaction) {
+ LOGGER.debug("Resumed the transaction");
+ }
}
@Override
@@ -92,11 +102,13 @@
@Override
public void setRollbackOnly(Throwable arg0) throws Exception {
+ LOGGER.debug("Marking rollback for the transaction due to an exception", arg0);
getTxControl().setRollbackOnly();
}
@Override
public void setRollbackOnly() throws IllegalStateException, SystemException {
+ LOGGER.debug("Marking rollback for the transaction");
getTxControl().setRollbackOnly();
}
@@ -153,6 +165,7 @@
@Override
public void registerSynchronization(Synchronization synch)
throws IllegalStateException, RollbackException, SystemException {
+ LOGGER.debug("Registering a synchronization with the current transaction");
TransactionContext currentContext = getTxControl().getCurrentContext();
currentContext.preCompletion(synch::beforeCompletion);
currentContext.postCompletion(status -> synch.afterCompletion(toIntStatus(status)));
diff --git a/tx-control-provider-jpa-xa/pom.xml b/tx-control-provider-jpa-xa/pom.xml
index 07c2e36..97330f0 100644
--- a/tx-control-provider-jpa-xa/pom.xml
+++ b/tx-control-provider-jpa-xa/pom.xml
@@ -111,23 +111,29 @@
<artifactId>geronimo-jpa_2.1_spec</artifactId>
</dependency>
- <!-- JPA Provider dependencies -->
+ <!-- JPA Provider Plugin dependencies -->
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>org.eclipse.persistence.core</artifactId>
- <version>2.4.2</version>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-eclipselink</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>5.0.0.Final</version>
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_0</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-kernel</artifactId>
- <version>2.0.0</version>
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_2</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jpa-xa-plugin-openjpa</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
diff --git a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java b/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java
index 4a4c800..a8bbb6b 100644
--- a/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java
+++ b/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java
@@ -41,9 +41,13 @@
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.jpa.EntityManagerFactoryBuilder;
import org.osgi.service.transaction.control.TransactionControl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class XAJPAEMFLocator extends AbstractManagedJPAEMFLocator {
+ private static final Logger LOGGER = LoggerFactory.getLogger(XAJPAEMFLocator.class);
+
public XAJPAEMFLocator(BundleContext context, String pid, Map<String, Object> jpaProperties,
Map<String, Object> providerProperties, Runnable onClose) throws InvalidSyntaxException, ConfigurationException {
super(context, pid, jpaProperties, providerProperties, onClose);
@@ -72,7 +76,7 @@
ServiceReference<PersistenceProvider> providerRef = getPersistenceProvider(provider, context);
if(providerRef == null) {
- // TODO log a warning and give up
+ LOGGER.warn("Unable to find a Persistence Provider for the provider named {}, so no XA plugin can be registered. XA transactions are unlikely to function properly.", provider);
return;
}
@@ -82,20 +86,34 @@
try {
if("org.hibernate.jpa.HibernatePersistenceProvider".equals(provider)) {
- try{
- providerBundle.loadClass("org.hibernate.resource.transaction.TransactionCoordinatorBuilder");
- } catch (Exception e) {
- BundleWiring wiring = providerBundle.adapt(BundleWiring.class);
- providerBundle = wiring.getRequiredWires("osgi.wiring.package").stream()
- .filter(bw -> "org.hibernate".equals(bw.getCapability().getAttributes().get("osgi.wiring.package")))
- .map(BundleWire::getProviderWiring)
- .map(BundleWiring::getBundle)
- .findFirst().get();
+ String pluginClass;
+
+ Bundle toUse = findSource(providerBundle, "org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder");
+
+ if(toUse != null) {
+
+ try {
+ toUse.loadClass("org.hibernate.resource.transaction.spi.DdlTransactionIsolator");
+ LOGGER.debug("Detected Hibernate 5.2.2 or above when attempting to install the XA plugin.");
+ pluginClass = "org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl.Hibernate522TxControlPlatform";
+ } catch (Exception e) {
+ LOGGER.debug("Detected Hibernate 5.2.0 or 5.2.1 when attempting to install the XA plugin.");
+ pluginClass = "org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl.Hibernate520TxControlPlatform";
+ }
+ } else {
+ toUse = findSource(providerBundle, "org.hibernate.resource.transaction.TransactionCoordinatorBuilder");
+ if(toUse != null) {
+ LOGGER.debug("Detected Hibernate 5.0.x or 5.1.x or above when attempting to install the XA plugin.");
+ pluginClass = "org.apache.aries.tx.control.jpa.xa.plugin.hibernate.impl.HibernateTxControlPlatform";
+ } else {
+ LOGGER.warn("Detected a Hibernate provider, but we were unable to load an appropriate XA plugin");
+ return;
+ }
}
- ClassLoader pluginLoader = getPluginLoader(providerBundle, txControlProviderBundle);
+ ClassLoader pluginLoader = getPluginLoader(toUse, txControlProviderBundle);
- Class<?> pluginClazz = pluginLoader.loadClass("org.apache.aries.tx.control.jpa.xa.hibernate.impl.HibernateTxControlPlatform");
+ Class<?> pluginClazz = pluginLoader.loadClass(pluginClass);
Object plugin = pluginClazz.getConstructor(ThreadLocal.class)
.newInstance(t);
@@ -105,7 +123,7 @@
ClassLoader pluginLoader = getPluginLoader(providerBundle, txControlProviderBundle);
- Class<?> pluginClazz = pluginLoader.loadClass("org.apache.aries.tx.control.jpa.xa.openjpa.impl.OpenJPATxControlPlatform");
+ Class<?> pluginClazz = pluginLoader.loadClass("org.apache.aries.tx.control.jpa.xa.plugin.openjpa.impl.OpenJPATxControlPlatform");
Object plugin = pluginClazz.getConstructor(ThreadLocal.class)
.newInstance(t);
@@ -115,7 +133,7 @@
ClassLoader pluginLoader = getPluginLoader(providerBundle, txControlProviderBundle);
- Class<?> pluginClazz = pluginLoader.loadClass("org.apache.aries.tx.control.jpa.xa.eclipse.impl.EclipseTxControlPlatform");
+ Class<?> pluginClazz = pluginLoader.loadClass("org.apache.aries.tx.control.jpa.xa.plugin.eclipse.impl.EclipseTxControlPlatform");
pluginClazz.getMethod("setTransactionControl", ThreadLocal.class)
.invoke(null, t);
@@ -129,7 +147,7 @@
}
} else {
- // TODO log a warning and give up
+ LOGGER.warn("The persistence provider {} is not recognised, so no adapter plugin can be registered with it. XA transactions are unlikely to work properly", provider);
return;
}
} catch (Exception e) {
@@ -138,6 +156,28 @@
}
}
+ private Bundle findSource(Bundle providerBundle, String toFind) {
+ try{
+ providerBundle.loadClass(toFind);
+ return providerBundle;
+ } catch (Exception e) {
+ BundleWiring wiring = providerBundle.adapt(BundleWiring.class);
+ return wiring.getRequiredWires("osgi.wiring.package").stream()
+ .filter(bw -> "org.hibernate".equals(bw.getCapability().getAttributes().get("osgi.wiring.package")))
+ .map(BundleWire::getProviderWiring)
+ .map(BundleWiring::getBundle)
+ .findFirst()
+ .filter(b -> {
+ try {
+ b.loadClass(toFind);
+ return true;
+ } catch (Exception e2) {
+ return false;
+ }
+ }).orElse(null);
+ }
+ }
+
private ClassLoader getPluginLoader(Bundle providerBundle, Bundle txControlProviderBundle) {
return new ClassLoader() {
@@ -145,9 +185,7 @@
@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
- if(name.startsWith("org.apache.aries.tx.control.jpa.xa.hibernate") ||
- name.startsWith("org.apache.aries.tx.control.jpa.xa.openjpa") ||
- name.startsWith("org.apache.aries.tx.control.jpa.xa.eclipse")) {
+ if(name.startsWith("org.apache.aries.tx.control.jpa.xa.plugin")) {
Class<?> c = loaded.get(name);
@@ -175,7 +213,8 @@
}
if(name.startsWith("org.apache.aries.tx.control") ||
- name.startsWith("org.osgi.service.transaction.control")) {
+ name.startsWith("org.osgi.service.transaction.control") ||
+ name.startsWith("org.slf4j")) {
return txControlProviderBundle.loadClass(name);
}
return providerBundle.loadClass(name);
