aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1800438 [4/5] - in /aries/trunk/tx-control: ./ tx-control-api/ tx-control-api/src/main/java/org/osgi/service/transaction/control/ tx-control-api/src/main/java/org/osgi/service/transaction/control/jdbc/ tx-control-api/src/main/java/org/osgi...
Date Fri, 30 Jun 2017 15:34:38 GMT
Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,9 +21,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-provider-jpa-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-provider-jpa-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_0</artifactId>
@@ -36,23 +36,21 @@
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin--hibernate-5_0
         </url>
 	</scm>
 
 	<dependencies>
-		<!-- Internal Aries project dependencies -->
+		<!-- OSGI API dependencies -->
 		<dependency>
-			<groupId>org.apache.aries.tx-control</groupId>
-			<artifactId>tx-control-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.transaction.control</artifactId>
 		</dependency>
 
 		<!-- JPA Provider dependencies -->
@@ -69,13 +67,4 @@
 			<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

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_0/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/HibernateTxControlPlatform.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/LICENSE&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/NOTICE&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/README.md&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,9 +21,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-provider-jpa-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-provider-jpa-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_2</artifactId>
@@ -36,23 +36,21 @@
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/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>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.transaction.control</artifactId>
 		</dependency>
 
 		<!-- JPA Provider dependencies -->
@@ -69,13 +67,4 @@
 			<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

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate520TxControlPlatform.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-hibernate-5_2/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/hibernate/impl/Hibernate522TxControlPlatform.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/LICENSE&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/NOTICE&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/README.md (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/README.md)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/README.md?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/README.md&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/README.md&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,9 +21,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-provider-jpa-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-provider-jpa-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-provider-jpa-xa-plugin-openjpa</artifactId>
@@ -36,24 +36,22 @@
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jpa/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
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/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>
+		<!-- OSGi API dependencies -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.transaction.control</artifactId>
+        </dependency>
 
 		<!-- JPA Provider dependencies -->
         <dependency>
@@ -69,13 +67,4 @@
 			<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

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-openjpa/src/main/java/org/apache/aries/tx/control/jpa/xa/plugin/openjpa/impl/OpenJPATxControlPlatform.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/.gitignore&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-service-common/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/LICENSE&p1=aries/trunk/tx-control/tx-control-service-common/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-service-common/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/NOTICE&p1=aries/trunk/tx-control/tx-control-service-common/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/README.md (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/README.md)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/README.md?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/README.md&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/README.md&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa/bnd.bnd (original)
+++ aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/bnd.bnd Fri Jun 30 15:34:31 2017
@@ -24,26 +24,15 @@ Export-Package: org.osgi.service.transac
                 org.osgi.service.transaction.control.jpa, \
                 org.osgi.service.cm, \
                 org.osgi.service.jdbc, \
-                org.osgi.service.jpa, \
-                javax.persistence;version=1.2;jpa=2.1, \
-                javax.persistence.criteria;version=1.2;jpa=2.1, \
-                javax.persistence.metamodel;version=1.2;jpa=2.1,  \
-                javax.persistence.spi;version=1.2;jpa=2.1,  \
-                javax.persistence;version=2.1,  \
-                javax.persistence.criteria;version=2.1, \
-                javax.persistence.metamodel;version=2.1,  \
-                javax.persistence.spi;version=2.1
+                org.osgi.service.jpa
 
 
-# We repackage the JPA API internals and we also embed Hikari CP 
-# to avoid dependency fanout
+# We embed Hikari CP and JDBC code to avoid dependency fanout
 
 Private-Package: org.apache.aries.tx.control.jdbc.common.impl, \
                  org.apache.aries.tx.control.jdbc.xa.connection.impl, \
                  org.apache.aries.tx.control.resource.common.impl, \
                  org.apache.aries.tx.control.jpa.*, \
-                 org.apache.geronimo.osgi.locator, \
-                 org.apache.geronimo.specs.jpa, \
                  com.zaxxer.hikari, \
                  com.zaxxer.hikari.metrics, \
                  com.zaxxer.hikari.pool, \
@@ -72,10 +61,14 @@ Import-Package: !com.codahale.*, \
                 org.osgi.service.jpa, \
                 *
 
-Provide-Capability: osgi.contract;osgi.contract="JavaJPA";version:List<Version>="1.0,2.0,2.1";uses:="javax.persistence,javax.persistence.criteria,javax.persistence.metamodel,javax.persistence.spi", \
+Provide-Capability: \
                     osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProvider";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jpa", \
                     osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProviderFactory";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jpa"
                     
-Require-Capability: osgi.contract;filter:="(&(osgi.contract=JavaJPA)(version=2.1))", \
+# This Resource Provider is able to work with JPA 2.0 or 2.1, but may need enhancement
+# for future versions, hence we prohibit versions of the contract greater than 2.1.x
+# Because of this complexity we can't just use -contract: JavaJPA.
+Require-Capability: \
+                    osgi.contract;filter:="(&(osgi.contract=JavaJPA)(|(version=2)(version=2.1))(!(version>=2.2)))",\
                     osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active", \
                     osgi.service;filter:="(objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder)";resolution:="optional";effective:="active"

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,9 +21,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-provider-jpa-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-provider-jpa-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-provider-jpa-xa</artifactId>
@@ -49,39 +49,35 @@
 	<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>
-		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-common</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
         </dependency>
 		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jpa-common</artifactId>
-            <version>${project.version}</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jdbc-common</artifactId>
-            <version>${project.version}</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jdbc-xa</artifactId>
-            <version>${project.version}</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
 		<!-- OSGi API dependencies -->
 		<dependency>
 			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.transaction.control</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
 		</dependency>
 		<dependency>
@@ -107,33 +103,33 @@
 
 		<!-- JPA API dependency -->
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.1_spec</artifactId>
+			<groupId>org.apache.aries.jpa.javax.persistence</groupId>
+			<artifactId>javax.persistence_2.1</artifactId>
 		</dependency>
 		
 		<!-- JPA Provider Plugin dependencies -->
 		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jpa-xa-plugin-eclipselink</artifactId>
-            <version>${version}</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_0</artifactId>
-            <version>${version}</version>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 		<dependency>
             <groupId>org.apache.aries.tx-control</groupId>
             <artifactId>tx-control-provider-jpa-xa-plugin-hibernate-5_2</artifactId>
-            <version>${version}</version>
+            <version>1.0.0-SNAPSHOT</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>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -153,12 +149,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Activator.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Activator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Activator.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Activator.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Activator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Config.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Config.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Config.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Config.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/Config.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/DelayedJPAEntityManagerProvider.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/DelayedJPAEntityManagerProvider.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/DelayedJPAEntityManagerProvider.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/DelayedJPAEntityManagerProvider.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/DelayedJPAEntityManagerProvider.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderFactoryImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/JPAEntityManagerProviderImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPADataSourceSetup.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPADataSourceSetup.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPADataSourceSetup.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPADataSourceSetup.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPADataSourceSetup.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAEMFLocator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAManagedServiceFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAManagedServiceFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAManagedServiceFactory.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAManagedServiceFactory.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XAJPAManagedServiceFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManager.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManager.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManager.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManager.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/main/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManager.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java?p2=aries/trunk/tx-control/tx-control-providers/jpa/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa/src/test/java/org/apache/aries/tx/control/jpa/xa/impl/XATxContextBindingEntityManagerTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Added: aries/trunk/tx-control/tx-control-providers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/pom.xml?rev=1800438&view=auto
==============================================================================
--- aries/trunk/tx-control/tx-control-providers/pom.xml (added)
+++ aries/trunk/tx-control/tx-control-providers/pom.xml Fri Jun 30 15:34:31 2017
@@ -0,0 +1,93 @@
+<?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-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../tx-control-parent/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.aries.tx-control</groupId>
+	<artifactId>tx-control-providers</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<description>Apache Aries Transaction Control Resource Provider implementations.</description>
+	<scm>
+		<connection>
+			scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers
+		</developerConnection>
+		<url>
+			http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers
+		</url>
+	</scm>
+
+    <profiles>
+        <profile>
+            <id>all</id>
+            <activation>
+                <property>
+                    <name>!tx.providers</name>
+                </property>
+            </activation>
+            <modules>
+                <module>jdbc</module>
+                <module>jpa</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jdbc</id>
+            <activation>
+                <property>
+                    <name>tx.providers</name>
+                    <value>jdbc</value>
+                </property>
+            </activation>
+            <modules>
+                <module>jdbc</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>jpa</id>
+            <properties>
+                <jpa>true</jpa>
+            </properties>
+            <activation>
+                <property>
+                    <name>tx.providers</name>
+                    <value>jpa</value>
+                </property>
+            </activation>
+            <modules>
+                <module>jpa</module>
+            </modules>
+        </profile>
+    </profiles>
+    
+    <modules>
+        <module>tx-control-provider-parent</module>
+        <module>tx-control-provider-common</module>
+    </modules>
+
+</project>

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-common/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-common/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-common/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,15 +21,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-provider-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-provider-common</artifactId>
 	<packaging>jar</packaging>
 	<name>OSGi Transaction Control Resource Provider - Common Code</name>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>${project.parent.version}</version>
 	
 	<description>
         This jar contains a common code for building OSGi Transaction Control ResourceProvider 
@@ -39,25 +39,17 @@
     
     <scm>
         <connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-common
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common
         </connection>
         <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-common
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common
         </developerConnection>
         <url>
-            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-common
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common
         </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>
-        
         <!-- OSGi dependencies -->
         <dependency>
             <groupId>org.osgi</groupId>
@@ -65,6 +57,10 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.transaction.control</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.tracker</artifactId>
         </dependency>
         <dependency>
@@ -88,4 +84,4 @@
             <artifactId>mockito-all</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactory.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactory.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/LifecycleAware.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/LifecycleAware.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/LifecycleAware.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/LifecycleAware.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/LifecycleAware.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivator.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivator.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivator.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactory.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactory.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactory.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactory.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/main/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactoryTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactoryTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactoryTest.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactoryTest.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ConfigurationDefinedResourceFactoryTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivatorTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivatorTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivatorTest.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivatorTest.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceActivatorTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactoryTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactoryTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactoryTest.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactoryTest.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/ResourceProviderFactoryServiceFactoryTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactoryTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactoryTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactoryTest.java?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactoryTest.java&p1=aries/trunk/tx-control/tx-control-provider-common/src/test/java/org/apache/aries/tx/control/resource/common/impl/TrackingResourceProviderFactoryTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-providers/tx-control-provider-parent/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-api/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/tx-control-provider-parent/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/tx-control-provider-parent/pom.xml&p1=aries/trunk/tx-control/tx-control-api/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-api/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/tx-control-provider-parent/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,58 +21,25 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../../tx-control-parent/pom.xml</relativePath>
 	</parent>
+
 	<groupId>org.apache.aries.tx-control</groupId>
-	<artifactId>tx-control-api</artifactId>
-	<name>OSGi Transaction Control API</name>
+	<artifactId>tx-control-provider-parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-
-
-	<description>
-        This bundle contains the OSGi Transaction Control Service API.
-    </description>
-
+	<packaging>pom</packaging>
+	<description>Apache Aries Tx Control Providers Parent.</description>
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-api
-        </connection>
+			scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-provider-parent
+		</connection>
 		<developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-api
-        </developerConnection>
+			scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-provider-parent
+		</developerConnection>
 		<url>
-            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-api
-        </url>
+			http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-provider-parent
+		</url>
 	</scm>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.1_spec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>osgi.annotation</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
+</project>

Added: aries/trunk/tx-control/tx-control-services/README.md
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/README.md?rev=1800438&view=auto
==============================================================================
--- aries/trunk/tx-control/tx-control-services/README.md (added)
+++ aries/trunk/tx-control/tx-control-services/README.md Fri Jun 30 15:34:31 2017
@@ -0,0 +1,121 @@
+Apache Aries OSGi Transaction Control Service implementations
+------------------------------------------------------------
+
+This project contains modules which implement the OSGi Transaction Control Service.
+
+The Transaction Control Service is defined in Chapter 147 of the OSGi R7 specification. This specification is not yet final, but public drafts of this specification are available from the OSGi Alliance.
+
+Given that the RFC is non-final the OSGi API declared in this project is subject to change at any time up to its official release. Also the behaviour of this implementation may not always be up-to-date with the latest wording in the RFC. The project maintainers will, however try to keep pace with the RFC, and to ensure that the implementations are compliant with any OSGi specifications that result from the RFC.
+
+# Modules
+
+The following implementations are available:
+
+1. tx-control-service-local :- A purely local transaction control service implementation. This can be used with any resource-local capable ResourceProvider
+2. tx-control-service-xa :- An XA-capable transaction control service implementation based on the Geronimo Transaction Manager. This can be used with XA capable resources, or with local resources. Local resources will make use of the last-participant gambit.
+
+
+## Which modules should I use?
+
+If you wish to use entirely lightweight, resource-local transactions then it is best to pair the tx-control-service-local with a local resource provider implementation.
+
+If two-phase commit is needed across multiple resources then the tx-control-service-xa must be used with an XA capable resource provider implementation.
+
+It is not advised to use multiple Transaction Control Service implementations at the same time. This will be confusing, and may lead to problems if different parts of your application bind to different service implementations. If you do choose to deploy multiple Transaction Control services then please ensure that the different parts of your application target the correct service implementation.
+
+# Using the Transaction Control Service
+
+The Transaction Control service is used in conjunction with one or more ResourceProvider services to provide scoped resource access. 
+
+## Accessing the TransactionControl service
+
+The TransactionControl implementation is registered as an OSGi service in the service registry. This can easily be injected using various OSGi frameworks. For example using Declarative Services:
+
+    @Reference
+    private TransactionControl txControl;
+
+
+## Controlling the transaction lifecycle
+
+When using the Transaction Control service your code is running in one of three scopes:
+
+1. Unscoped :- In this case there is no scope associated with the thread. Resources cannot be used and will throw Exceptions.
+2. No Transaction Scope :- Resources may be used in this scope, but there is no transaction associated with the thread. This means that resources will be cleaned up at the end of the scope but no work will be committed. Changes in this scope may not be atomic.
+3. Transaction Scope := In this case there is an active transaction and resources will participate in it. Updates and reads will be atomic, and will all roll back in the event of a failure.
+
+
+### Starting a Transaction or scope
+
+To start a transaction simply pass a `Callable` to the `required` method of the TransactionControl service. The Callable will be run scoped in a transaction
+
+    txControl.required(() -> {
+            // Use a resource in here
+        });
+
+To start a scope without starting a transaction simply pass a `Callable` to the `notSupported` method of the TransactionControl service. The Callable will be run within a non-transactioonal scope
+
+    txControl.notSupported(() -> {
+        // Use a resource in here, but it won't be part of a transaction
+    });
+
+
+### Finishing a Transaction or Scope
+
+A scope (including any related transaction) finishes when the `Callable` completes. Any resources used in the scope will be cleaned up automatically so there is no need to close them. If the scope is transactional then it will either:
+
+ * Commit the transaction. This will occur if the `Callable` returns normally, and the transaction has not been marked for rollback.
+
+  or
+
+ * Roll back the transaction. This will occur if the `Callable` exits with an `Exception` or if the transaction has been marked for rollback by calling `setRollbackOnly()`.
+
+Marking a transaction for rollback:
+
+    txControl.required(() -> {
+        // This call means that the transaction must roll back.
+        txControl.setRollbackOnly();
+    });
+
+
+### Transaction Inheritance
+
+Transactions may be inherited:
+
+    txControl.required(() -> {
+    
+            // A transaction is running here
+    
+            txControl.required(() -> {
+                    // The same transaction is in force here
+                });
+
+        });
+
+Transactions may be suspended:
+
+    txControl.required(() -> {
+    
+            // A transaction is running here
+    
+            txControl.notSupported(() -> {
+                    // No transaction in here
+                });
+
+            // The original transaction is in force
+        });
+
+Transactions may be nested:
+
+    txControl.required(() -> {
+        
+        // A transaction is running here
+        
+        txControl.requiresNew(() -> {
+                // A new transaction is in force here
+            });
+
+    });
+
+### Advanced usage
+
+For more advanced usage see the API JavaDoc, and read the Transaction Control Service Specification

Added: aries/trunk/tx-control/tx-control-services/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/pom.xml?rev=1800438&view=auto
==============================================================================
--- aries/trunk/tx-control/tx-control-services/pom.xml (added)
+++ aries/trunk/tx-control/tx-control-services/pom.xml Fri Jun 30 15:34:31 2017
@@ -0,0 +1,53 @@
+<?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-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../tx-control-parent</relativePath>
+	</parent>
+
+	<groupId>org.apache.aries.tx-control</groupId>
+	<artifactId>tx-control-services</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<description>Transaction Control service implementations Reactor</description>
+	<scm>
+		<connection>
+			scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services
+		</developerConnection>
+		<url>
+			http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services
+		</url>
+	</scm>
+
+    <modules>
+        <module>tx-control-service-parent</module>
+        <module>tx-control-service-common</module>
+        <module>tx-control-service-local</module>
+        <module>tx-control-service-xa</module>
+    </modules>
+
+</project>

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-service-local/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/LICENSE?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/LICENSE&p1=aries/trunk/tx-control/tx-control-service-local/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-service-local/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/NOTICE?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/NOTICE&p1=aries/trunk/tx-control/tx-control-service-local/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/bnd.bnd?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jpa-xa-plugin-eclipselink/bnd.bnd (original)
+++ aries/trunk/tx-control/tx-control-services/tx-control-service-common/bnd.bnd Fri Jun 30 15:34:31 2017
@@ -16,6 +16,6 @@
 #    under the License.
 
 # This bundle must never resolve, it's only purpose is to be repackaged in
-# the main XA JPA provider
+# a complete transaction control implementation
 Require-Capability:\
    osgi.compile.time.only;filter:="(&(must.not.resolve=*)(!(must.not.resolve=*)))"
\ No newline at end of file

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-service-common/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/pom.xml?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/pom.xml&p1=aries/trunk/tx-control/tx-control-service-common/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-common/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-services/tx-control-service-common/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,14 +21,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-service-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-service-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-service-common</artifactId>
 	<name>OSGi Transaction Control Service - Common Code</name>
-	<version>1.0.0-SNAPSHOT</version>
+	<!-- 
+	  The common code version always tracks the services parent.
+	  If we need an update of this project then it ripples through
+	  all of the the Transaction Control service implementations
+	 -->
+	<version>${project.parent.version}</version>
 
 	<description>
         This jar contains a common code for building OSGi Transaction Control Service implementations.
@@ -38,23 +43,21 @@
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-common
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-common
         </connection>
 		<developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-common
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-common
         </developerConnection>
 		<url>
-            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-common
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common
         </url>
 	</scm>
 
 	<dependencies>
-		<!-- Internal Aries project dependencies -->
+		<!-- OSGi API dependencies -->
 		<dependency>
-			<groupId>org.apache.aries.tx-control</groupId>
-			<artifactId>tx-control-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.transaction.control</artifactId>
 		</dependency>
 		
 		<!-- Logging dependencies -->
@@ -67,13 +70,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
         </dependency>
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionContextImpl.java (from r1800243, aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionContextImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionContextImpl.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionContextImpl.java&p1=aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionContextImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionControlImpl.java (from r1800243, aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionControlImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionControlImpl.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionControlImpl.java&p1=aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/AbstractTransactionControlImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java (from r1800243, aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java&p1=aries/trunk/tx-control/tx-control-service-common/src/main/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java (from r1800243, aries/trunk/tx-control/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java&p1=aries/trunk/tx-control/tx-control-service-common/src/test/java/org/apache/aries/tx/control/service/common/impl/NoTransactionContextTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-service-xa/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/LICENSE?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/LICENSE&p1=aries/trunk/tx-control/tx-control-service-xa/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-service-xa/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/NOTICE?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/NOTICE&p1=aries/trunk/tx-control/tx-control-service-xa/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-service-local/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/bnd.bnd?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/bnd.bnd&p1=aries/trunk/tx-control/tx-control-service-local/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-service-local/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/pom.xml?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/pom.xml&p1=aries/trunk/tx-control/tx-control-service-local/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-services/tx-control-service-local/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,28 +21,28 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.aries.tx-control</groupId>
-		<artifactId>tx-control</artifactId>
+		<artifactId>tx-control-service-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<relativePath>../tx-control-service-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-service-local</artifactId>
-	<name>OSGi Transaction Control Service - Local Transactions</name>
+	<name>Apache Aries Transaction Control Service - Local Transactions</name>
 	<version>1.0.0-SNAPSHOT</version>
 
 	<description>
-        This bundle contains an OSGi Transaction Control Service implementation suitable for local resources.
+        This bundle contains a lightweight OSGi Transaction Control Service implementation suitable for resource-local transactions.
     </description>
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-local
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-local
         </connection>
 		<developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-local
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-local
         </developerConnection>
 		<url>
-            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-local
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local
         </url>
 	</scm>
 
@@ -51,14 +51,8 @@
 		<!-- 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>
-		<dependency>
-			<groupId>org.apache.aries.tx-control</groupId>
 			<artifactId>tx-control-service-common</artifactId>
-			<version>${project.version}</version>
+			<version>${project.parent.version}</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -66,8 +60,11 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
-			<scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.transaction.control</artifactId>
+        </dependency>
 
 		<!-- Logging dependencies -->
 		<dependency>
@@ -79,21 +76,10 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
 		</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
+</project>

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/Activator.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/Activator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/Activator.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/Activator.java&p1=aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/Activator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java&p1=aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionContextImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionControlImpl.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionControlImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionControlImpl.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionControlImpl.java&p1=aries/trunk/tx-control/tx-control-service-local/src/main/java/org/apache/aries/tx/control/service/local/impl/TransactionControlImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java&p1=aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionContextTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlRunningTest.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlRunningTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlRunningTest.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlRunningTest.java&p1=aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlRunningTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlStatusTest.java (from r1800243, aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlStatusTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlStatusTest.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlStatusTest.java&p1=aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionControlStatusTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)



Mime
View raw message