Author: amita
Date: Thu Nov 1 04:19:35 2007
New Revision: 590966
URL: http://svn.apache.org/viewvc?rev=590966&view=rev
Log:
TUSCANY-1886 keep transaction sample in sync with Geronimo TM changes
Modified:
incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
incubator/tuscany/java/das/samples/transaction/build.xml
incubator/tuscany/java/das/samples/transaction/pom.xml
incubator/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
Modified:
incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml?rev=590966&r1=590965&r2=590966&view=diff
==============================================================================
--- incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
(original)
+++ incubator/tuscany/java/das/distribution/binary/src/main/assembly/das.xml
Thu Nov 1 04:19:35 2007
@@ -139,13 +139,10 @@
<outputDirectory>tuscany-das-${das.version}/samples/transaction</outputDirectory>
<includes>
<include>mysql:mysql-connector-java</include>
-
<include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
-
<include>org.apache.geronimo.modules:geronimo-kernel</include>
-
<include>org.apache.geronimo.modules:geronimo-transaction</include>
-
<include>org.apache.geronimo.modules:geronimo-connector</include>
+
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+
<include>org.apache.geronimo.components:geronimo-transaction</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.tuscany.das.samples:tuscany-das-sample-dbconfig</include>
- <include>commons-logging:commons-logging</include>
</includes>
<fileMode>0644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/das/samples/transaction/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/transaction/build.xml?rev=590966&r1=590965&r2=590966&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/transaction/build.xml (original)
+++ incubator/tuscany/java/das/samples/transaction/build.xml Thu Nov 1
04:19:35 2007
@@ -32,12 +32,10 @@
<include name="**/*.jar"/>
</fileset>
<pathelement location="mysql-connector-java-5.0.4.jar"/>
- <pathelement location="commons-logging-1.1.jar"/>
- <pathelement location="geronimo-jta_1.0.1B_spec-1.0.jar"/>
- <pathelement location="geronimo-kernel-1.2-beta.jar"/>
- <pathelement location="geronimo-transaction-1.2-beta.jar"/>
- <pathelement location="geronimo-connector-1.2-beta.jar"/>
- <pathelement
location="geronimo-j2ee-connector_1.5_spec-1.0.1.jar"/>
+ <pathelement location="commons-logging-1.0.4.jar"/>
+ <pathelement location="geronimo-jta_1.1_spec-1.1.jar"/>
+ <pathelement location="geronimo-transaction-2.0.1.jar"/>
+ <pathelement
location="geronimo-j2ee-connector_1.5_spec-1.1.1.jar"/>
<pathelement
location="tuscany-das-sample-dbconfig-1.0-incubating-SNAPSHOT.jar"/>
<pathelement path="${test.jar}"/>
</classpath>
Modified: incubator/tuscany/java/das/samples/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/transaction/pom.xml?rev=590966&r1=590965&r2=590966&view=diff
==============================================================================
--- incubator/tuscany/java/das/samples/transaction/pom.xml (original)
+++ incubator/tuscany/java/das/samples/transaction/pom.xml Thu Nov 1 04:19:35
2007
@@ -74,14 +74,14 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.0</version>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>1.2-beta</version>
+ <version>2.0.1</version>
<exclusions>
<exclusion>
<artifactId>mx4j</artifactId>
Modified:
incubator/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java?rev=590966&r1=590965&r2=590966&view=diff
==============================================================================
---
incubator/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
(original)
+++
incubator/tuscany/java/das/samples/transaction/src/main/java/org/apache/tuscany/samples/das/tx/manager/GeronimoTransactionManagerService.java
Thu Nov 1 04:19:35 2007
@@ -61,7 +61,7 @@
public void init() throws Exception {
XidFactoryImpl factory = new XidFactoryImpl();
- transactionManager = new TransactionManagerImpl(timeout, factory,
null, null);
+ transactionManager = new TransactionManagerImpl(timeout, factory,
null);
}
public void begin() throws NotSupportedException, SystemException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
