[infinispan-commits] Infinispan SVN: r1374 - in trunk: demos/ec2/src/main/resources and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Jan 15 09:26:29 EST 2010
Author: galder.zamarreno at jboss.com
Date: 2010-01-15 09:26:29 -0500 (Fri, 15 Jan 2010)
New Revision: 1374
Modified:
trunk/core/src/main/resources/importConfig.bat
trunk/core/src/main/resources/importConfig.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh
trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh
trunk/demos/gui/src/main/resources/runGuiDemo.bat
trunk/demos/gui/src/main/resources/runGuiDemo.sh
Log:
[ISPN-331] (Fix core jar/lib locations in scripts) Done.
Modified: trunk/core/src/main/resources/importConfig.bat
===================================================================
--- trunk/core/src/main/resources/importConfig.bat 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/core/src/main/resources/importConfig.bat 2010-01-15 14:26:29 UTC (rev 1374)
@@ -3,10 +3,10 @@
setlocal enabledelayedexpansion
set LIB=
-for %%f in (..\modules\core\lib\*.jar) do set LIB=!LIB!;%%f
+for %%f in (..\lib\*.jar) do set LIB=!LIB!;%%f
rem echo libs: %LIB%
-set CP=%LIB%;..\modules\core\infinispan-core.jar;%CP%
+set CP=%LIB%;..\infinispan-core.jar;%CP%
java -classpath "%CP%" org.infinispan.config.parsing.ConfigFilesConvertor %1 %2 %3 %4 %5 %6
:fileEnd
\ No newline at end of file
Modified: trunk/core/src/main/resources/importConfig.sh
===================================================================
--- trunk/core/src/main/resources/importConfig.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/core/src/main/resources/importConfig.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -9,12 +9,12 @@
fi
export ISPN_HOME
-if [ -e ${ISPN_HOME}/modules/core/lib ]
+if [ -e ${ISPN_HOME}/lib ]
then
- for JAR in ${ISPN_HOME}/modules/core/lib/*
+ for JAR in ${ISPN_HOME}/lib/*
do
CLASSPATH=$CLASSPATH:$JAR
done
fi
-CLASSPATH=${ISPN_HOME}/modules/core/infinispan-core.jar:$CLASSPATH
+CLASSPATH=${ISPN_HOME}/infinispan-core.jar:$CLASSPATH
java -classpath $CLASSPATH org.infinispan.config.parsing.ConfigFilesConvertor ${*}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -11,7 +11,7 @@
CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
-for i in `find ${ISPN_HOME}/modules/core -name "*.jar"` ; do
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
CP=${CP}:${i}
done
@@ -19,6 +19,7 @@
CP=${CP}:${i}
done
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -15,6 +15,12 @@
CP=${CP}:${i}
done
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
+ CP=${CP}:${i}
+done
+
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
+
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -15,6 +15,12 @@
CP=${CP}:${i}
done
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
+ CP=${CP}:${i}
+done
+
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
+
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -15,6 +15,12 @@
CP=${CP}:${i}
done
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
+ CP=${CP}:${i}
+done
+
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
+
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -15,6 +15,12 @@
CP=${CP}:${i}
done
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
+ CP=${CP}:${i}
+done
+
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
+
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -15,6 +15,12 @@
CP=${CP}:${i}
done
+for i in `find ${ISPN_HOME}/lib -name "*.jar"` ; do
+ CP=${CP}:${i}
+done
+
+CP=${ISPN_HOME}/infinispan-core.jar:$CP
+
JVM_PARAMS="${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
Modified: trunk/demos/gui/src/main/resources/runGuiDemo.bat
===================================================================
--- trunk/demos/gui/src/main/resources/runGuiDemo.bat 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/gui/src/main/resources/runGuiDemo.bat 2010-01-15 14:26:29 UTC (rev 1374)
@@ -2,23 +2,18 @@
:noenvreset
set my_classpath=
-for /f "tokens=* delims=" %%f in ('dir /s /b /a-d "..\modules\core\lib\*.jar"') do (
+for /f "tokens=* delims=" %%f in ('dir /s /b /a-d "..\lib\*.jar"') do (
call set my_classpath=%%my_classpath%%;%%~f)
)
set my_classpath=%my_classpath:~1%
-for /f "tokens=* delims=" %%f in ('dir /s /b /a-d "..\modules\core\*.jar"') do (
- call set my_classpath=%%my_classpath%%;%%~f)
- )
-set my_classpath=%my_classpath:~1%
+set my_classpath=%my_classpath;..\infinispan-core.jar
-
for /f "tokens=* delims=" %%f in ('dir /s /b /a-d "..\modules\gui\*.jar"') do (
call set my_classpath=%%my_classpath%%;%%~f)
)
set my_classpath=%my_classpath:~1%
-
for /f "tokens=* delims=" %%f in ('dir /s /b /a-d "..\modules\gui\lib\*.jar"') do (
call set my_classpath=%%my_classpath%%;%%~f)
)
Modified: trunk/demos/gui/src/main/resources/runGuiDemo.sh
===================================================================
--- trunk/demos/gui/src/main/resources/runGuiDemo.sh 2010-01-15 14:01:57 UTC (rev 1373)
+++ trunk/demos/gui/src/main/resources/runGuiDemo.sh 2010-01-15 14:26:29 UTC (rev 1374)
@@ -11,11 +11,9 @@
CP=${CP}:${ISPN_HOME}/etc
-for i in ${ISPN_HOME}/modules/core/*.jar ; do
- CP=${i}:${CP}
-done
+CP=${CP}:${ISPN_HOME}/infinispan-core.jar
-for i in ${ISPN_HOME}/modules/core/lib/*.jar ; do
+for i in ${ISPN_HOME}/lib/*.jar ; do
CP=${i}:${CP}
done
More information about the infinispan-commits
mailing list