[jboss-svn-commits] JBL Code SVN: r37379 - in labs/jbosstm/trunk: ArjunaJTA/quickstarts and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 11 06:11:06 EDT 2011
Author: tomjenkinson
Date: 2011-08-11 06:11:06 -0400 (Thu, 11 Aug 2011)
New Revision: 37379
Added:
labs/jbosstm/trunk/narayana-full/run_all_quickstarts.bat
labs/jbosstm/trunk/narayana-full/run_all_quickstarts.sh
Removed:
labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.bat
labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.sh
labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.bat
labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.sh
labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.bat
labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.sh
Modified:
labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
labs/jbosstm/trunk/qa/build.xml
Log:
make consistent between blacktie and narayana
Deleted: labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.bat 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.bat 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,17 +0,0 @@
- at echo off
-
-echo "Running all quickstarts"
-
-set OLDPWD=%cd%
-
-for /R * %%i in (.) do (
- if exist %%i\run.sh (
- cd %%i
- call run.bat %*
- IF %ERRORLEVEL% NEQ 0 exit -1
- )
-)
-
-cd /d %OLDPWD%
-
-echo "All quickstarts ran OK"
Deleted: labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.sh 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.sh 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,16 +0,0 @@
-# ALLOW JOBS TO BE BACKGROUNDED
-set -m
-
-echo "Running all quickstarts"
-
-for i in `find * -name run.sh | sed 's#\(.*\)/.*#\1#' |sort -u`
-do
- cd $i
- ./run.sh
- if [ "$?" != "0" ]; then
- exit -1
- fi
- cd -
-done
-
-echo "All quickstarts ran OK"
Deleted: labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.bat 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.bat 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,17 +0,0 @@
- at echo off
-
-echo "Running all quickstarts"
-
-set OLDPWD=%cd%
-
-for /R * %%i in (.) do (
- if exist %%i\run.sh (
- cd %%i
- call run.bat %*
- IF %ERRORLEVEL% NEQ 0 exit -1
- )
-)
-
-cd /d %OLDPWD%
-
-echo "All quickstarts ran OK"
Deleted: labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.sh 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/run_all_quickstarts.sh 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,16 +0,0 @@
-# ALLOW JOBS TO BE BACKGROUNDED
-set -m
-
-echo "Running all quickstarts"
-
-for i in `find * -name run.sh | sed 's#\(.*\)/.*#\1#' |sort -u`
-do
- cd $i
- ./run.sh
- if [ "$?" != "0" ]; then
- exit -1
- fi
- cd -
-done
-
-echo "All quickstarts ran OK"
Copied: labs/jbosstm/trunk/narayana-full/run_all_quickstarts.bat (from rev 37377, labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.bat)
===================================================================
--- labs/jbosstm/trunk/narayana-full/run_all_quickstarts.bat (rev 0)
+++ labs/jbosstm/trunk/narayana-full/run_all_quickstarts.bat 2011-08-11 10:11:06 UTC (rev 37379)
@@ -0,0 +1,17 @@
+ at echo off
+
+echo "Running all quickstarts"
+
+set OLDPWD=%cd%
+
+for /R quickstarts %%i in (.) do (
+ if exist %%i\run.sh (
+ cd %%i
+ call run.bat %*
+ IF %ERRORLEVEL% NEQ 0 exit -1
+ )
+)
+
+cd /d %OLDPWD%
+
+echo "All quickstarts ran OK"
Copied: labs/jbosstm/trunk/narayana-full/run_all_quickstarts.sh (from rev 37377, labs/jbosstm/trunk/ArjunaCore/quickstarts/run_all_quickstarts.sh)
===================================================================
--- labs/jbosstm/trunk/narayana-full/run_all_quickstarts.sh (rev 0)
+++ labs/jbosstm/trunk/narayana-full/run_all_quickstarts.sh 2011-08-11 10:11:06 UTC (rev 37379)
@@ -0,0 +1,16 @@
+# ALLOW JOBS TO BE BACKGROUNDED
+set -m
+
+echo "Running all quickstarts"
+
+for i in `find quickstarts/ -name run.sh | sed 's#\(.*\)/.*#\1#' |sort -u`
+do
+ cd $i
+ ./run.sh
+ if [ "$?" != "0" ]; then
+ exit -1
+ fi
+ cd -
+done
+
+echo "All quickstarts ran OK"
Modified: labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml 2011-08-11 10:11:06 UTC (rev 37379)
@@ -279,6 +279,18 @@
<files>
<file>
+ <source>readme.txt</source>
+ <fileMode>0644</fileMode>
+ </file>
+ <file>
+ <source>run_all_quickstarts.sh</source>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>run_all_quickstarts.bat</source>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
<source>../ArjunaJTS/copyright.txt</source>
<fileMode>0644</fileMode>
</file>
@@ -306,10 +318,6 @@
<destName>jbossts-properties.xml.jts</destName>
</file>
<file>
- <source>readme.txt</source>
- <fileMode>0644</fileMode>
- </file>
- <file>
<source>../XTS/third_party_licenses.txt</source>
<fileMode>0644</fileMode>
<outputDirectory>lib/ext</outputDirectory>
@@ -332,12 +340,19 @@
<fileSets>
<fileSet>
<directory>${basedir}/../ArjunaCore/scripts</directory>
+ <outputDirectory>.</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>*-setup-env.*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../ArjunaCore/scripts</directory>
<outputDirectory>bin</outputDirectory>
<filtered>true</filtered>
<includes>
<include>start-transaction-service*</include>
<include>start-recovery-manager*</include>
- <include>*-setup-env.*</include>
</includes>
</fileSet>
<fileSet>
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/qa/build.xml 2011-08-11 10:11:06 UTC (rev 37379)
@@ -24,7 +24,7 @@
<property name="driver.home" value="dbdrivers"/>
<!-- set this property to the location of a JBossTS JTA/JTS build or installation -->
- <property name="org.jboss.jbossts.qa.ts.home" location="../install"/>
+ <property name="org.jboss.jbossts.qa.ts.home" location="dist"/>
<property name="jbossts.install.lib" location="${org.jboss.jbossts.qa.ts.home}/lib"/>
<!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
@@ -88,12 +88,12 @@
<target name="buildtype">
<available file="${jbossts.install.lib}/narayana-jts.jar" property="buildtype" value="jts"/>
- <available file="${jbossts.install.lib}/jts.jar" property="buildtype" value="jts"/>
+<!-- <available file="${jbossts.install.lib}/jts.jar" property="buildtype" value="jts"/> -->
<available file="${jbossts.install.lib}/narayana-jta.jar" property="buildtype" value="jta"/>
- <available file="${jbossts.install.lib}/jta.jar" property="buildtype" value="jta"/>
+<!-- <available file="${jbossts.install.lib}/jta.jar" property="buildtype" value="jta"/> -->
- <available file="${jbossts.install.lib}/arjunacore.jar" property="buildtype" value="core"/>
+<!-- <available file="${jbossts.install.lib}/arjunacore.jar" property="buildtype" value="core"/> -->
<available file="${jbossts.install.lib}/narayana-jta-integration.jar" property="integration.build"/>
<available file="${jbossts.install.lib}/narayana-jts-integration.jar" property="integration.build"/>
@@ -114,12 +114,29 @@
<!-- always use jts regardless of build type, as we may not be able to
determine the build type at clean time and jts should have the superset -->
<ant dir="tests" antfile="build-jts.xml" target="clean"/>
+
+ <delete dir="org.jboss.jbossts.qa.ts.home"/>
</target>
- <target name="init" depends="buildtype">
+ <target name="init">
<mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
+ <mkdir dir="${org.jboss.jbossts.qa.ts.home}"/>
+ <unzip file="../narayana-full/target/narayana-full-*-bin.zip" todir="${org.jboss.jbossts.qa.ts.home}"/>
+ <antcall target="init-jta"/>
+ <antcall target="init-jts"/>
+ <antcall target="buildtype"/>
</target>
+
+ <target name="init-jta" if="init-jta">
+ <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta.jar"/>
+ <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta-integration.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jta-integration.jar"/>
+ </target>
+ <target name="init-jts" unless="init-jta">
+ <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts.jar"/>
+ <move file="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts-integration.jar.jta" tofile="${org.jboss.jbossts.qa.ts.home}/lib/narayana-jts-integration.jar"/>
+ </target>
+
<target name="dist" depends="clean, init">
<!-- build the test suite -->
Deleted: labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.bat
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.bat 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.bat 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,17 +0,0 @@
- at echo off
-
-echo "Running all quickstarts"
-
-set OLDPWD=%cd%
-
-for /R * %%i in (.) do (
- if exist %%i\run.sh (
- cd %%i
- call run.bat %*
- IF %ERRORLEVEL% NEQ 0 exit -1
- )
-)
-
-cd /d %OLDPWD%
-
-echo "All quickstarts ran OK"
Deleted: labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.sh
===================================================================
--- labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.sh 2011-08-11 10:02:41 UTC (rev 37378)
+++ labs/jbosstm/trunk/rest-tx/quickstarts/run_all_quickstarts.sh 2011-08-11 10:11:06 UTC (rev 37379)
@@ -1,16 +0,0 @@
-# ALLOW JOBS TO BE BACKGROUNDED
-set -m
-
-echo "Running all quickstarts"
-
-for i in `find * -name run.sh | sed 's#\(.*\)/.*#\1#' |sort -u`
-do
- cd $i
- ./run.sh
- if [ "$?" != "0" ]; then
- exit -1
- fi
- cd -
-done
-
-echo "All quickstarts ran OK"
More information about the jboss-svn-commits
mailing list