[jboss-svn-commits] JBL Code SVN: r29558 - in labs/jbosstm/workspace/resttx: demo and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 8 10:54:12 EDT 2009
Author: mmusgrov
Date: 2009-10-08 10:54:11 -0400 (Thu, 08 Oct 2009)
New Revision: 29558
Added:
labs/jbosstm/workspace/resttx/webservice/recovery
Removed:
labs/jbosstm/workspace/resttx/recovery
labs/jbosstm/workspace/resttx/webservice/ObjectStore/
Modified:
labs/jbosstm/workspace/resttx/demo/go
labs/jbosstm/workspace/resttx/tx/pom.xml
labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/resource/RESTRecord.java
labs/jbosstm/workspace/resttx/webservice/build.xml
labs/jbosstm/workspace/resttx/webservice/pom.xml
Log:
fix recovery (had the wrong JBossTS jar)
Modified: labs/jbosstm/workspace/resttx/demo/go
===================================================================
--- labs/jbosstm/workspace/resttx/demo/go 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/demo/go 2009-10-08 14:54:11 UTC (rev 29558)
@@ -6,7 +6,7 @@
# yum install libstdc++.so.5
(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title Coordinator -e ./go&)
-(cd ..; xterm -geom 132x40 -leftbar -sb -sl 2000 -title RecoveryManager -e ./recovery&)
+(cd ../webservice; xterm -geom 132x40 -leftbar -sb -sl 2000 -title RecoveryManager -e ./recovery&)
sleep 2
Deleted: labs/jbosstm/workspace/resttx/recovery
===================================================================
--- labs/jbosstm/workspace/resttx/recovery 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/recovery 2009-10-08 14:54:11 UTC (rev 29558)
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-ant rm
Modified: labs/jbosstm/workspace/resttx/tx/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/tx/pom.xml 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/tx/pom.xml 2009-10-08 14:54:11 UTC (rev 29558)
@@ -52,7 +52,7 @@
<dependencies>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
+ <artifactId>jbossjta</artifactId>
<version>4.4.0.GA</version>
</dependency>
<dependency>
Modified: labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/resource/RESTRecord.java
===================================================================
--- labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/resource/RESTRecord.java 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/tx/src/main/java/org/jboss/jbossts/rts/resource/RESTRecord.java 2009-10-08 14:54:11 UTC (rev 29558)
@@ -223,10 +223,11 @@
try
{
- if (log.isDebugEnabled()) log.debug("commiting " + this.url);
+ if (log.isDebugEnabled()) log.info("commiting " + this.url);
if (!statusUrl.endsWith("prepare-readonly"))
statusUrl = TxUtil.doPost(new int[] {HttpResponseCodes.SC_CREATED}, this.url + "/commit"); //, "context=" + txUrl));
+ log.info("COMMIT OK at url: " + this.url);
return TwoPhaseOutcome.FINISH_OK;
}
catch (HttpResponseException e)
@@ -242,6 +243,7 @@
{
this.statusUrl = TxUtil.doPost(new int[] {HttpResponseCodes.SC_CREATED}, this.url + "/commit"); //, "context=" + txUrl));
+ log.info("COMMIT OK at new url: " + this.url);
return TwoPhaseOutcome.FINISH_OK;
}
catch (HttpResponseException e1)
Modified: labs/jbosstm/workspace/resttx/webservice/build.xml
===================================================================
--- labs/jbosstm/workspace/resttx/webservice/build.xml 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/webservice/build.xml 2009-10-08 14:54:11 UTC (rev 29558)
@@ -3,26 +3,47 @@
<project name="REST" default="run" basedir=".">
<property name="build.classes.dir" value="target/classes/"/>
- <property name="xsrc.dir" value="src"/>
<property name="src.dir" value="src/main/java/org/jboss/jbossts/rts/client/"/>
- <property name="resteasy.dir" value="${basedir}/target/rest-tx/WEB-INF/lib"/>
+ <property name="resteasy.dir" value="${basedir}/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib"/>
<path id="classpath">
+ <!--
<pathelement location="${build.classes.dir}"/>
- <pathelement location="target/rest-tx/WEB-INF/lib/junit-4.5.jar"/>
- <pathelement location="${basedir}/target/rest-tx/WEB-INF/lib/log4j-1.2.12.jar"/>
- <pathelement location="${basedir}/target/rest-tx/WEB-INF/lib/commons-logging-1.1.jar"/>
+ -->
+ <pathelement location="target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib/junit-4.5.jar"/>
+ <pathelement location="${basedir}/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib/log4j-1.2.12.jar"/>
+ <pathelement location="${basedir}/target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib/commons-logging-1.1.jar"/>
<pathelement location="${basedir}/target/test-classes"/>
+ <pathelement location="target/rest-tx-web-1.0-M1-SNAPSHOT/WEB-INF/lib/rest-tx-api-1.0-M1-SNAPSHOT.jar"/>
<fileset dir="${resteasy.dir}" >
<include name="jaxrs-api-1.0-RC1.jar"/>
<include name="resteasy-jaxrs-1.0-RC1.jar"/>
<include name="commons-httpclient-3.1.jar"/>
<include name="commons-logging-1.0.4.jar"/>
<include name="commons-codec-1.2.jar"/>
+ <!-- jar for running an external recovery manager -->
+ <include name="jbossjta-4.4.0.GA.jar"/>
+ <include name="jbossts-common-4.4.0.GA.jar"/>
+ <include name="log4j-1.2.12.jar"/>
+ <include name="logkit-1.0.1.jar"/>
</fileset>
+ <!--
+ <pathelement location="${basedir}/target/classes"/>
+ <pathelement location="${basedir}/src/test/resources"/>
+ -->
</path>
+ <target name="rm">
+ <java classname="com.arjuna.ats.arjuna.recovery.RecoveryManager" fork="yes" dir=".">
+ <classpath refid="classpath"/>
+ <!--
+ <sysproperty key="com.arjuna.ats.arjuna.common.propertiesFile" value="${basedir}/src/test/resources"/>
+ -->
+ <sysproperty key="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="30"/>
+ </java>
+ </target>
+
<target name="compile">
<javac srcdir="${src.dir}"
destdir="${build.classes.dir}"
Modified: labs/jbosstm/workspace/resttx/webservice/pom.xml
===================================================================
--- labs/jbosstm/workspace/resttx/webservice/pom.xml 2009-10-08 14:34:23 UTC (rev 29557)
+++ labs/jbosstm/workspace/resttx/webservice/pom.xml 2009-10-08 14:54:11 UTC (rev 29558)
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
+ <artifactId>jbossjta</artifactId>
<version>4.4.0.GA</version>
</dependency>
<dependency>
Copied: labs/jbosstm/workspace/resttx/webservice/recovery (from rev 26780, labs/jbosstm/workspace/resttx/recovery)
===================================================================
--- labs/jbosstm/workspace/resttx/webservice/recovery (rev 0)
+++ labs/jbosstm/workspace/resttx/webservice/recovery 2009-10-08 14:54:11 UTC (rev 29558)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ant rm
Property changes on: labs/jbosstm/workspace/resttx/webservice/recovery
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
More information about the jboss-svn-commits
mailing list