[jboss-svn-commits] JBL Code SVN: r37388 - labs/jbosstm/trunk/ArjunaCore/scripts.

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

Author: tomjenkinson
Date: 2011-08-11 09:09:36 -0400 (Thu, 11 Aug 2011)
New Revision: 37388

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
Log:
updated to make sure that the environment can be configured correctly

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat	2011-08-11 12:27:37 UTC (rev 37387)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.bat	2011-08-11 13:09:36 UTC (rev 37388)
@@ -38,15 +38,11 @@
 set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jta.jar
 set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
 
-set EXT_CLASSPATH=%NARAYANA_HOME%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\connector-api.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jmxri.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jndi.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jta-1_1-classes.zip
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\log4j-1.2.14.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xercesImpl.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xmlParserAPIs.jar
+setlocal ENABLEDELAYEDEXPANSION
+FOR /R %NARAYANA_HOME%\lib\ext %%G IN (*.jar) DO set EXT_CLASSPATH=%%G;!EXT_CLASSPATH!
+endlocal & set EXT_CLASSPATH=%EXT_CLASSPATH%
 
+
 set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%
 
 goto end

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh	2011-08-11 12:27:37 UTC (rev 37387)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jta-setup-env.sh	2011-08-11 13:09:36 UTC (rev 37388)
@@ -63,12 +63,11 @@
 PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jta.jar"
 PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
 
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/connector-api.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jmxri.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jndi.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jta-1_1-classes.zip"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/log4j-1.2.14.jar"
+for i in $NARAYANA_HOME/lib/ext/*.jar
+do
+EXT_CLASSPATH="$EXT_CLASSPATH$CPS$i"
+done
+export EXT_CLASSPATH
 
 CLASSPATH=".$CPS$PRODUCT_CLASSPATH$CPS$EXT_CLASSPATH"
 export CLASSPATH

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat	2011-08-11 12:27:37 UTC (rev 37387)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.bat	2011-08-11 13:09:36 UTC (rev 37388)
@@ -31,6 +31,8 @@
 
 echo Environment variable NARAYANA_HOME set to "%NARAYANA_HOME%"
 
+set JACORB_HOME=%NARAYANA_HOME%\jacorb
+
 rem Setup EXT classpath
 
 echo Setting up environment
@@ -38,24 +40,17 @@
 set PRODUCT_CLASSPATH=%NARAYANA_HOME%\lib\narayana-jts.jar
 set PRODUCT_CLASSPATH=%PRODUCT_CLASSPATH%;%NARAYANA_HOME%\etc\
 
-set EXT_CLASSPATH=%NARAYANA_HOME%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\connector-api.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jmxri.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jndi.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\jta-1_1-classes.zip
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\log4j-1.2.14.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xercesImpl.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%NARAYANA_HOME%\lib\ext\xmlParserAPIs.jar
+setlocal ENABLEDELAYEDEXPANSION
+FOR /R %NARAYANA_HOME%\lib\ext %%G IN (*.jar) DO set EXT_CLASSPATH=%%G;!EXT_CLASSPATH!
+endlocal & set EXT_CLASSPATH=%EXT_CLASSPATH%
 
 rem
 rem Caution: JBossTS needs a specially patched version of JacORB.
 rem Use %JBOSSTS_HOME%\jacorb here unless you have a good reason not to.
 rem
-set JACORB_HOME=PUT_JACORB_HOME_HERE
-set JACORB_CLASSPATH=%JACORB_HOME%\lib\jacorb.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\idl.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\logkit-1.2.jar
-set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\lib\avalon-framework-4.1.5.jar
+setlocal ENABLEDELAYEDEXPANSION
+FOR /R %JACORB_HOME%\lib %%G IN (*.jar) DO set JACORB_CLASSPATH=%%G;!JACORB_CLASSPATH!
+endlocal & set JACORB_CLASSPATH=%JACORB_CLASSPATH%
 set JACORB_CLASSPATH=%JACORB_CLASSPATH%;%JACORB_HOME%\etc
 
 set CLASSPATH=.;%PRODUCT_CLASSPATH%;%EXT_CLASSPATH%;%JACORB_CLASSPATH%

Modified: labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh	2011-08-11 12:27:37 UTC (rev 37387)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/jts-setup-env.sh	2011-08-11 13:09:36 UTC (rev 37388)
@@ -70,17 +70,18 @@
 PRODUCT_CLASSPATH="$NARAYANA_HOME/lib/narayana-jts.jar"
 PRODUCT_CLASSPATH="$PRODUCT_CLASSPATH$CPS$NARAYANA_HOME/etc/"
 
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/connector-api.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jmxri.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jndi.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/jta-1_1-classes.zip"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$NARAYANA_HOME/lib/ext/log4j-1.2.14.jar"
 
-JACORB_CLASSPATH="$JACORB_HOME/lib/jacorb.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/idl.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/logkit-1.2.jar"
-JACORB_CLASSPATH="$JACORB_CLASSPATH$CPS$JACORB_HOME/lib/avalon-framework-4.1.5.jar"
+for i in $NARAYANA_HOME/lib/ext/*.jar
+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"