You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2017/06/30 15:34:38 UTC
svn commit: r1800438 [2/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...
Modified: aries/trunk/tx-control/README.md
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/README.md?rev=1800438&r1=1800437&r2=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/README.md (original)
+++ aries/trunk/tx-control/README.md Fri Jun 30 15:34:31 2017
@@ -1,9 +1,9 @@
-Sample OSGi Transaction Control Service implementation
-------------------------------------------------------
+Apache Aries OSGi Transaction Control Service implementations
+-------------------------------------------------------------
-This set of modules is a prototype implementation of the OSGi Transaction Control Service and related services, such as JDBC resource provision.
+This project contains sets of modules which implement parts of the OSGi Transaction Control Service specification. This includes implementations of the Transaction Control Service and various Resource Provider services implementations, such as JDBC and JPAn.
-The Transaction Control Service (RFC-221) is an in-progress RFC publicly available from the OSGi Alliance: https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf
+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.
@@ -11,115 +11,15 @@ Given that the RFC is non-final the OSGi
The following modules are available for use in OSGi
-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.
-3. tx-control-provider-jdbc-local := A JDBC resource provider that can integrate with local transactions. The JDBCConnectionProviderFactory service may be used directly, or a service may be configured using the _org.apache.aries.tx.control.jdbc.local_ pid
-4. tx-control-provider-jdbc-xa := A JDBC resource provider that can integrate with local or XA transactions. The JDBCConnectionProviderFactory service may be used directly, or a service may be configured using the _org.apache.aries.tx.control.jdbc.xa_ pid
+1. tx-control-services :- This project contains implementations of the OSGi Transaction Control Service. You will need to select one appropriate for your needs.
+2. tx-control-providers :- This project contains implementations of OSGi Transaction Control Resource Providers. You will need an appropriate resource provider for each type of resource that you want to interact with.
+3. tx-control-parent := The parent pom for modules produced by this project.
## 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 and tx-control-provider-jdbc-local bundles.
+If you wish to use entirely lightweight, resource-local transactions then it is best to pair a local service implementation with the relevant local provider.
-If two-phase commit is needed across multiple resources then the tx-control-service-xa and tx-control-provider-jdbc-xa bundles should be used.
+If two-phase commit is needed across multiple resources then an XA capable service implementation and relevant xa capable resource provider(s) must be used.
-DO NOT use both tx-control-service-xa and tx-control-service-local at the same time. This will be confusing, and will lead to problems if different parts of the runtime bind to different service implementations.
-
-There is also no reason to use the tx-control-provider-jdbc-local in addition to the tx-control-provider-jdbc-xa service. Using both together is not typically harmful, however the tx-control-provider-jdbc-xa bundle supports all of the same features as the tx-control-provider-jdbc-local bundle.
-
-# Using the Transaction Control Service
-
-The Transaction Control service is used in conjunction with one or more ResourceProvider services to provide scoped resource access.
-
-## Creating a resource
-
-Preparing a resource for use is very simple. Connect the ResourceProvider to a TransactionControl, and the thread-safe created resource can then be used in any ongoing scoped work.
-
- @Reference
- TransactionControl txControl;
-
- @Reference
- ResourceProvider<MyResource> provider;
-
- MyResource resource;
-
- @Activate
- void start() {
- resource = provider.getResource(txControl);
- }
-
- /**
- * Persists data inside a transaction
- */
- public void persistData(MyData data) {
- txControl.required(() -> resource.persist(data));
- }
-
-
-### Specialised resource interfaces
-
-The OSGi service registry does not natively handle genericized types, so the Transaction Control RFC defines specialised interface types for common resource types, for example the JDBCConnectionProvider.
-
- @Reference
- TransactionControl txControl;
-
- @Reference
- JDBCConnectionProvider provider;
-
- Connection conn;
-
- @Activate
- void start() {
- conn = provider.getResource(txControl);
- }
-
- public void findUserName(String id) {
- txControl.required(() -> {
- // Use the connection in here
- });
- }
-
-## 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
-
-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 the connection in here
- });
-
-Transactions may be nested:
-
- txControl.required(() -> {
-
- // Use the connection in here
-
- txControl.required(() -> {
- // Nested transaction in here
- });
-
- });
-
-Transactions may be or suspended:
-
- txControl.required(() -> {
-
- // Use the connection in here
-
- txControl.notSupported(() -> {
- // Nested transaction in here
- });
-
- });
-
-### Advanced usage
-
-For more advanced usage see the API JavaDoc, and read the RFC (https://github.com/osgi/design/blob/master/rfcs/rfc0221/rfc-0221-TransactionControl.pdf)
\ No newline at end of file
+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.
Modified: aries/trunk/tx-control/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/pom.xml?rev=1800438&r1=1800437&r2=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/pom.xml (original)
+++ aries/trunk/tx-control/pom.xml Fri Jun 30 15:34:31 2017
@@ -20,17 +20,17 @@
<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</groupId>
- <artifactId>apache</artifactId>
- <version>17</version>
- <relativePath />
+ <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</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Transaction Control service, including Resource Provider implementations.</description>
+ <description>Apache Aries Transaction Control Reactor POM</description>
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control
@@ -45,146 +45,46 @@
<profiles>
<profile>
- <id>jdk18</id>
+ <id>all</id>
<activation>
- <jdk>1.8</jdk>
+ <property>
+ <name>!tx.build</name>
+ </property>
</activation>
<modules>
- <module>tx-control-api</module>
- <module>tx-control-service-common</module>
- <module>tx-control-service-local</module>
- <module>tx-control-service-xa</module>
- <module>tx-control-provider-common</module>
- <module>tx-control-provider-jdbc-common</module>
- <module>tx-control-provider-jdbc-local</module>
- <module>tx-control-provider-jdbc-xa</module>
- <module>tx-control-provider-jpa-common</module>
- <module>tx-control-provider-jpa-local</module>
- <module>tx-control-provider-jpa-xa-plugin-eclipselink</module>
- <module>tx-control-provider-jpa-xa-plugin-hibernate-5_0</module>
- <module>tx-control-provider-jpa-xa-plugin-hibernate-5_2</module>
- <module>tx-control-provider-jpa-xa-plugin-openjpa</module>
- <module>tx-control-provider-jpa-xa</module>
- <module>tx-control-itests</module>
- <module>tx-control-jpa-itests</module>
- </modules>
+ <module>tx-control-providers</module>
+ <module>tx-control-services</module>
+ </modules>
</profile>
+ <profile>
+ <id>providers</id>
+ <activation>
+ <property>
+ <name>tx.build</name>
+ <value>providers</value>
+ </property>
+ </activation>
+ <modules>
+ <module>tx-control-providers</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>services</id>
+ <activation>
+ <property>
+ <name>tx.build</name>
+ <value>services</value>
+ </property>
+ </activation>
+ <modules>
+ <module>tx-control-services</module>
+ </modules>
+ </profile>
</profiles>
+
+ <modules>
+ <module>tx-control-parent</module>
+ </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>6.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.tracker</artifactId>
- <version>1.5.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <version>1.5.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jdbc</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jpa</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.metatype.annotations</artifactId>
- <version>1.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- <version>1.0-alpha-1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>2.4.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>default-bnd-process</id>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
\ No newline at end of file
+</project>
Copied: aries/trunk/tx-control/tx-control-parent/pom.xml (from r1800243, aries/trunk/tx-control/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-parent/pom.xml?p2=aries/trunk/tx-control/tx-control-parent/pom.xml&p1=aries/trunk/tx-control/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-parent/pom.xml Fri Jun 30 15:34:31 2017
@@ -27,49 +27,48 @@
</parent>
<groupId>org.apache.aries.tx-control</groupId>
- <artifactId>tx-control</artifactId>
+ <artifactId>tx-control-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <description>Transaction Control service, including Resource Provider implementations.</description>
+ <description>Apache Aries Tx Control Parent.</description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-parent
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-parent
</developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/tx-control
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-parent
</url>
</scm>
-
- <profiles>
- <profile>
- <id>jdk18</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <modules>
- <module>tx-control-api</module>
- <module>tx-control-service-common</module>
- <module>tx-control-service-local</module>
- <module>tx-control-service-xa</module>
- <module>tx-control-provider-common</module>
- <module>tx-control-provider-jdbc-common</module>
- <module>tx-control-provider-jdbc-local</module>
- <module>tx-control-provider-jdbc-xa</module>
- <module>tx-control-provider-jpa-common</module>
- <module>tx-control-provider-jpa-local</module>
- <module>tx-control-provider-jpa-xa-plugin-eclipselink</module>
- <module>tx-control-provider-jpa-xa-plugin-hibernate-5_0</module>
- <module>tx-control-provider-jpa-xa-plugin-hibernate-5_2</module>
- <module>tx-control-provider-jpa-xa-plugin-openjpa</module>
- <module>tx-control-provider-jpa-xa</module>
- <module>tx-control-itests</module>
- <module>tx-control-jpa-itests</module>
- </modules>
- </profile>
- </profiles>
+
+ <repositories>
+ <repository>
+ <id>OSGi-spec-snapshots</id>
+ <url>https://oss.sonatype.org/content/repositories/osgi/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>Apache-snapshots</id>
+ <url>https://repository.apache.org/content/groups/snapshots-group</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<dependencyManagement>
<dependencies>
@@ -99,14 +98,8 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jdbc</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jpa</artifactId>
- <version>1.0.0</version>
+ <artifactId>org.osgi.service.transaction.control</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -120,19 +113,7 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- <version>1.0-alpha-1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>2.4.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
@@ -174,7 +155,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>default-bnd-process</id>
@@ -186,5 +167,12 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <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-providers/README.md
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/README.md?rev=1800438&view=auto
==============================================================================
--- aries/trunk/tx-control/tx-control-providers/README.md (added)
+++ aries/trunk/tx-control/tx-control-providers/README.md Fri Jun 30 15:34:31 2017
@@ -0,0 +1,15 @@
+Apache Aries OSGi Transaction Control Resource Providers
+--------------------------------------------------------
+
+This project contains modules which implement OSGi Transaction Control Resource Providers.
+
+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 Resource Provider types are available:
+
+1. jdbc :- Resource Providers that work with JDBC resources and the OSGi JDBC service
+2. jpa :- Resource Providers that work with JPA resources and the OSGi JPA service
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/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/jdbc/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jdbc/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/jdbc/pom.xml Fri Jun 30 15:34:31 2017
@@ -20,59 +20,35 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.tx-control</groupId>
- <artifactId>tx-control</artifactId>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <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-jdbc</artifactId>
<version>1.0.0-SNAPSHOT</version>
-
-
- <description>
- This bundle contains the OSGi Transaction Control Service API.
- </description>
-
+ <packaging>pom</packaging>
+ <description>Apache Aries Transaction Control JDBC Resource Providers.</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-providers/jdbc
+ </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-providers/jdbc
+ </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-providers/jdbc
+ </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>
+ <modules>
+ <module>tx-control-provider-jdbc-parent</module>
+ <module>tx-control-provider-jdbc-common</module>
+ <module>tx-control-provider-jdbc-local</module>
+ <module>tx-control-provider-jdbc-xa</module>
+ <module>tx-control-jdbc-itests</module>
+ </modules>
-</project>
\ No newline at end of file
+</project>
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-itests/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/.gitignore&p1=aries/trunk/tx-control/tx-control-itests/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-api/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/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-providers/jdbc/tx-control-jdbc-itests/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-api/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/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-providers/jdbc/tx-control-jdbc-itests/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-itests/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml&p1=aries/trunk/tx-control/tx-control-itests/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-itests/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/pom.xml Fri Jun 30 15:34:31 2017
@@ -21,27 +21,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries.tx-control</groupId>
- <artifactId>tx-control</artifactId>
+ <artifactId>tx-control-provider-jdbc-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../tx-control-provider-jdbc-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
- <artifactId>org.apache.aries.tx-control-itests</artifactId>
+ <artifactId>tx-control-jdbc-itests</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Apache Aries Transaction Control iTests</name>
+ <name>Apache Aries Transaction Control JDBC iTests</name>
<description>
Integration tests using for the Transaction Control service
</description>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-itests
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-itests
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests
</developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/proxy/tx-control/tx-control-itests
+ http://svn.apache.org/viewvc/aries/trunk/proxy/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests
</url>
</scm>
@@ -60,21 +60,15 @@
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
- <artifactId>tx-control-api</artifactId>
- <scope>provided</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-local</artifactId>
<scope>test</scope>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-xa</artifactId>
<scope>test</scope>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -92,13 +86,13 @@
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-local</artifactId>
<scope>test</scope>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-xa</artifactId>
<scope>test</scope>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -269,4 +263,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/AbstractTransactionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionLifecycleTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionLifecycleTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionLifecycleTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionLifecycleTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionLifecycleTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionRefreshTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionRefreshTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionRefreshTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionRefreshTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ConnectionRefreshTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/CoordinatorOptimisationTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/CoordinatorOptimisationTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/CoordinatorOptimisationTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/CoordinatorOptimisationTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/CoordinatorOptimisationTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ExceptionManagementTransactionTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ExceptionManagementTransactionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ExceptionManagementTransactionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/ExceptionManagementTransactionTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/ExceptionManagementTransactionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleTransactionTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleTransactionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleTransactionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleTransactionTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleTransactionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SpringJdbcTemplateTransactionTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/SpringJdbcTemplateTransactionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SpringJdbcTemplateTransactionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/SpringJdbcTemplateTransactionTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/SpringJdbcTemplateTransactionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java (from r1800243, aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-jdbc-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java&p1=aries/trunk/tx-control/tx-control-itests/src/test/java/org/apache/aries/tx/control/itests/XATransactionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-jpa-itests/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/.gitignore&p1=aries/trunk/tx-control/tx-control-jpa-itests/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/LICENSE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/NOTICE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-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-providers/jdbc/tx-control-provider-jdbc-common/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-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-providers/jdbc/tx-control-provider-jdbc-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 JDBC resource provider 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-providers/jdbc/tx-control-provider-jdbc-common/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-common/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-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-provider-jdbc-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../tx-control-provider-jdbc-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-common</artifactId>
<packaging>jar</packaging>
<name>OSGi Transaction Control JDBC 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 JDBCConnectionProvider
@@ -39,13 +39,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-common
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-common
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common
</developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-common
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common
</url>
</scm>
@@ -53,20 +53,16 @@
<!-- 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>
<!-- OSGi 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>
@@ -104,4 +100,4 @@
<artifactId>mockito-all</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractInternalJDBCConnectionProviderFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractInternalJDBCConnectionProviderFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractInternalJDBCConnectionProviderFactory.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractInternalJDBCConnectionProviderFactory.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractInternalJDBCConnectionProviderFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractJDBCConnectionProvider.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractJDBCConnectionProvider.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractJDBCConnectionProvider.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractJDBCConnectionProvider.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/AbstractJDBCConnectionProvider.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ConnectionWrapper.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ConnectionWrapper.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ConnectionWrapper.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ConnectionWrapper.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ConnectionWrapper.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/DriverDataSource.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/DriverDataSource.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/DriverDataSource.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/DriverDataSource.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/DriverDataSource.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/InternalJDBCConnectionProviderFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/InternalJDBCConnectionProviderFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/InternalJDBCConnectionProviderFactory.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/InternalJDBCConnectionProviderFactory.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/InternalJDBCConnectionProviderFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ResourceTrackingJDBCConnectionProviderFactory.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ResourceTrackingJDBCConnectionProviderFactory.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ResourceTrackingJDBCConnectionProviderFactory.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ResourceTrackingJDBCConnectionProviderFactory.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ResourceTrackingJDBCConnectionProviderFactory.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapper.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapper.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapper.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapper.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapper.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/main/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapper.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapperTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapperTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapperTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapperTest.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/ScopedConnectionWrapperTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapperTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapperTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapperTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapperTest.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/src/test/java/org/apache/aries/tx/control/jdbc/common/impl/TxConnectionWrapperTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-common/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/.gitignore&p1=aries/trunk/tx-control/tx-control-provider-jdbc-common/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/LICENSE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/NOTICE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/README.md (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/README.md)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/README.md?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/README.md&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/README.md&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-local/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/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-jdbc-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../tx-control-provider-jdbc-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-local</artifactId>
@@ -36,13 +36,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-local
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-local
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local
</developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-local
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local
</url>
</scm>
@@ -50,24 +50,20 @@
<!-- 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-jdbc-common</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</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>
@@ -105,21 +101,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-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Activator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Config.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Config.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Config.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Config.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/Config.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderFactoryImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderFactoryImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderFactoryImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderFactoryImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/JDBCConnectionProviderImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/ManagedServiceFactoryImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnection.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnection.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnection.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnection.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/main/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnection.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/test/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnectionTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/src/test/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnectionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/test/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnectionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-local/src/test/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnectionTest.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/src/test/java/org/apache/aries/tx/control/jdbc/local/impl/TxContextBindingConnectionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Added: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent/pom.xml?rev=1800438&view=auto
==============================================================================
--- aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent/pom.xml (added)
+++ aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent/pom.xml Fri Jun 30 15:34:31 2017
@@ -0,0 +1,68 @@
+<?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-provider-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../tx-control-provider-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-jdbc-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <description>Apache Aries Tx Control JDBC resource provider parent.</description>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-parent
+ </url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.jdbc</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.tx-control</groupId>
+ <artifactId>tx-control-provider-common</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>2.4.7</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/.gitignore (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-local/.gitignore)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/.gitignore?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/.gitignore&p1=aries/trunk/tx-control/tx-control-provider-jdbc-local/.gitignore&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/LICENSE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/LICENSE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/LICENSE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/LICENSE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/LICENSE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/NOTICE (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/NOTICE)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/NOTICE?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/NOTICE&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/NOTICE&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/README.md (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/README.md)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/README.md?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/README.md&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/README.md&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/bnd.bnd)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/bnd.bnd&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/bnd.bnd&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/pom.xml (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/pom.xml?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/pom.xml&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
--- aries/trunk/tx-control/tx-control-provider-jdbc-xa/pom.xml (original)
+++ aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-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-jdbc-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../tx-control-provider-jdbc-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-xa</artifactId>
@@ -36,13 +36,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-xa
+ scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-provider-jdbc-xa
+ scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa
</developerConnection>
<url>
- http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-provider-jdbc-xa
+ http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa
</url>
</scm>
@@ -50,26 +50,22 @@
<!-- 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-jdbc-common</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</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>
@@ -105,21 +101,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-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XAConnectionWrapper.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XAConnectionWrapper.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XAConnectionWrapper.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XAConnectionWrapper.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XAConnectionWrapper.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XADataSourceMapper.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XADataSourceMapper.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XADataSourceMapper.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XADataSourceMapper.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/connection/impl/XADataSourceMapper.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Activator.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Activator.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Activator.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Activator.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Activator.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Config.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Config.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Config.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Config.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/Config.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderFactoryImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderFactoryImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderFactoryImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderFactoryImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderFactoryImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/JDBCConnectionProviderImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/ManagedServiceFactoryImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/ManagedServiceFactoryImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/ManagedServiceFactoryImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/ManagedServiceFactoryImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/ManagedServiceFactoryImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/RecoverableXAResourceImpl.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/RecoverableXAResourceImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/RecoverableXAResourceImpl.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/RecoverableXAResourceImpl.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/RecoverableXAResourceImpl.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/main/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnection.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)
Copied: aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java (from r1800243, aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java)
URL: http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java?p2=aries/trunk/tx-control/tx-control-providers/jdbc/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java&p1=aries/trunk/tx-control/tx-control-provider-jdbc-xa/src/test/java/org/apache/aries/tx/control/jdbc/xa/impl/XAEnabledTxContextBindingConnectionTest.java&r1=1800243&r2=1800438&rev=1800438&view=diff
==============================================================================
(empty)