[jboss-svn-commits] JBL Code SVN: r37389 - in labs/jbosstm/trunk: narayana-full and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-08-11 09:26:30 -0400 (Thu, 11 Aug 2011)
New Revision: 37389

Modified:
   labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat
   labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh
   labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat
   labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh
   labs/jbosstm/trunk/narayana-full/readme.txt
   labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
Log:
added more prompts to rename the files

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat	2011-08-11 13:26:30 UTC (rev 37389)
@@ -45,6 +45,8 @@
 
 set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%
 
+echo You MUST ensure you have renamed the files NARAYANA_HOME\lib\narayana-jta* to remove the .jta suffix
+
 goto end
 
 :java_home_error

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh	2011-08-11 13:26:30 UTC (rev 37389)
@@ -67,9 +67,10 @@
 do
 EXT_CLASSPATH="$EXT_CLASSPATH$CPS$i"
 done
-export EXT_CLASSPATH
 
 CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH"
 export CLASSPATH
 
+echo You MUST ensure you have renamed the files NARAYANA_HOME/lib/narayana-jta* to remove the .jta suffix
+
 fi

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat	2011-08-11 13:26:30 UTC (rev 37389)
@@ -55,6 +55,8 @@
 
 set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%;%JACORB_CLASSPATH%
 
+echo You MUST ensure you have renamed the files NARAYANA_HOME\lib\narayana-jts* to remove the .jts suffix
+
 goto end
 
 :java_home_error

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh	2011-08-11 13:26:30 UTC (rev 37389)
@@ -75,16 +75,16 @@
 do
 EXT_CLASSPATH="$EXT_CLASSPATH$CPS$i"
 done
-export EXT_CLASSPATH
 
 for i in $JACORB_HOME/lib/*.jar
 do
 JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$i"
 done
-export JACORB_CLASSPATH
 JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/etc"
 
 CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH$CPS$JACORB_CLASSPATH"
 export CLASSPATH
 
+echo You MUST ensure you have renamed the files NARAYANA_HOME/lib/narayana-jts* to remove the .jts suffix
+
 fi

Modified: labs/jbosstm/trunk/narayana-full/readme.txt
===================================================================
--- labs/jbosstm/trunk/narayana-full/readme.txt	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/narayana-full/readme.txt	2011-08-11 13:26:30 UTC (rev 37389)
@@ -5,6 +5,7 @@
  JTS and XTS are not currently available in AS7.
 Integration with JBossAS 6 or earlier is no longer supported.
 
+This version of Narayana contains a JTA/JTS/XTS and RTS. If you want to use either JTA/JTS or XTS standalone, you should follow the instructions below where the scripts to execute are detailed and the files you MUST rename are defined.
 
           WHATS INCLUDED
           --------------
@@ -53,7 +54,7 @@
 
           ENABLING JTA
           ------------
-To enable JTA you should:
+To enable JTA you MUST:
 1. Rename lib/narayana-jta.jar.jta to lib/narayana-jta.jar
 2. If you need to use this version of JTA in an application server, you should also rename lib/narayana-jta-integration.jar.jta to lib/narayana-jta-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
 3. Execute jta-setup-env.[bat|sh] to put JTA in the classpath
@@ -61,7 +62,7 @@
 
           ENABLING JTS
           ------------
-To enable JTA you should:
+To enable JTA you MUST:
 1. Rename lib/narayana-jts.jar.jts to lib/narayana-jts.jar
 2. If you need to use this version of JTS in an application server, you should also rename lib/narayana-jts-integration.jar.jts to lib/narayana-jts-integration.jar, however, note the comment above regarding manual upgrading of the component inside JBossAS is not recommended
 3. Execute jta-setup-env.[bat|sh] to put JTA in the classpath

Modified: labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml	2011-08-11 13:09:36 UTC (rev 37388)
+++ labs/jbosstm/trunk/narayana-full/src/main/assembly/bin.xml	2011-08-11 13:26:30 UTC (rev 37389)
@@ -57,6 +57,7 @@
 			<unpack>true</unpack>
 			<useProjectArtifact>false</useProjectArtifact>
 		</dependencySet>
+<!-- NO LONGER INCLUDING XTS TESTS IN THE BINARY
 		<dependencySet>
 			<includes>
 				<include>org.jboss.narayana.xts:localjunit</include>
@@ -87,6 +88,7 @@
 			<useTransitiveDependencies>false</useTransitiveDependencies>
 			<useProjectArtifact>false</useProjectArtifact>
 		</dependencySet>
+		-->
 		<dependencySet>
 			<includes>
 				<include>org.jboss.narayana.xts:jbossxts:jar:api</include>
@@ -340,6 +342,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>${basedir}/../ArjunaCore/scripts</directory>
+			<fileMode>0755</fileMode>
 			<outputDirectory>.</outputDirectory>
 			<filtered>true</filtered>
 			<includes>