aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From timothyjw...@apache.org
Subject svn commit: r1800438 [5/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-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionLifecycleTest.java
(from r1800243, aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionLifecycleTest.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/TransactionLifecycleTest.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionLifecycleTest.java&p1=aries/trunk/tx-control/tx-control-service-local/src/test/java/org/apache/aries/tx/control/service/local/impl/TransactionLifecycleTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-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-services/tx-control-service-parent/pom.xml?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-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-services/tx-control-service-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-service-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 Services 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-service-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-service-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-service-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>

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

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

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-xa/bnd.bnd (from r1800243,
aries/trunk/tx-control/tx-control-service-xa/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-xa/bnd.bnd?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-xa/bnd.bnd&p1=aries/trunk/tx-control/tx-control-service-xa/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-xa/bnd.bnd (original)
+++ aries/trunk/tx-control/tx-control-services/tx-control-service-xa/bnd.bnd Fri Jun 30 15:34:31
2017
@@ -45,7 +45,7 @@ Export-Package: org.osgi.service.transac
 Private-Package: javax.resource.spi, \
                  javax.transaction, \
                  org.apache.aries.tx.control.service.common.*, \
-                 org.apache.aries.tx.control.service.xa.*, \
+                 org.apache.aries.tx.control.service.xa.impl, \
                  org.apache.geronimo.transaction.*, \
                  org.objectweb.howl.log.*
 

Copied: aries/trunk/tx-control/tx-control-services/tx-control-service-xa/pom.xml (from r1800243,
aries/trunk/tx-control/tx-control-service-xa/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-xa/pom.xml?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-xa/pom.xml&p1=aries/trunk/tx-control/tx-control-service-xa/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-service-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-services/tx-control-service-xa/pom.xml Fri Jun 30 15:34:31
2017
@@ -21,29 +21,31 @@
 	<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-servce-parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.aries.tx-control</groupId>
 	<artifactId>tx-control-service-xa</artifactId>
-	<name>OSGi Transaction Control Service - XA Transactions</name>
+	<name>Apache Aries OSGi Transaction Control Service - XA Transactions</name>
 	<version>1.0.0-SNAPSHOT</version>
 
 	<description>
         This bundle contains an OSGi Transaction Control Service implementation based on
-        the Geronimo Transaction Manager. It is suitable for use with XA resources.
+        the Geronimo Transaction Manager. It is suitable for use with XA resources, supports
+        Local Resources using the last-participant gambit, and also supports transaction
+        recovery for recoverable Resource Providers.
     </description>
 
 	<scm>
 		<connection>
-            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-xa
+            scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-xa
         </connection>
 		<developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-service-xa
+            scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-services/tx-control-service-xa
         </developerConnection>
 		<url>
-            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-service-xa
+            http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-xa
         </url>
 	</scm>
 
@@ -51,14 +53,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,22 +62,22 @@
 		<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>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.util.tracker</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.cm</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.service.metatype.annotations</artifactId>
-			<scope>provided</scope>
 		</dependency>
 		
 		<!-- Geronimo transactions dependencies -->
@@ -101,6 +97,7 @@
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
             <version>1.0.1-1</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Logging dependencies -->
@@ -113,12 +110,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>
         <dependency>
             <groupId>com.h2database</groupId>
@@ -127,13 +122,4 @@
             <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-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Activator.java
(from r1800243, aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Activator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-services/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Activator.java?p2=aries/trunk/tx-control/tx-control-services/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Activator.java&p1=aries/trunk/tx-control/tx-control-service-xa/src/main/java/org/apache/aries/tx/control/service/xa/impl/Activator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
    (empty)

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

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

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

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

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

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

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

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

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

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

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



Mime
View raw message