[infinispan-commits] Infinispan SVN: r1838 - trunk/demos/ec2/src/main/resources.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue May 25 07:16:46 EDT 2010
Author: noelo
Date: 2010-05-25 07:16:45 -0400 (Tue, 25 May 2010)
New Revision: 1838
Modified:
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
Log:
Modified passing of config file and parameterization of jgroups config file
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,19 +21,18 @@
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"
+JVM_PARAMS="-Xmx512m ${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
-
#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
gunzip ${ISPN_HOME}/etc/Amazon-TestData/*.gz > /dev/null
-DEMO_ARGS="-p ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat"
+DEMO_ARGS=" -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
+DEMO_ARGS="${DEMO_ARGS} -p ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat"
DEMO_ARGS="${DEMO_ARGS} -n ${ISPN_HOME}/etc/Amazon-TestData/influenza_na.dat"
DEMO_ARGS="${DEMO_ARGS} -i ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat"
-java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
+
+java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,14 +21,14 @@
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"
+if [ ! -e ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat ]; then
+ gunzip ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat.gz > /dev/null
+fi
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+JVM_PARAMS="-Xmx512m ${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
-#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
-#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
-DEMO_ARGS="-i ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat"
+DEMO_ARGS="${DEMO_ARGS} -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
+DEMO_ARGS="${DEMO_ARGS} -i ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat"
+
java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,14 +21,14 @@
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"
+if [ ! -e ${ISPN_HOME}/etc/Amazon-TestData/influenza_na.dat ]; then
+ gunzip ${ISPN_HOME}/etc/Amazon-TestData/influenza_na.dat.gz > /dev/null
+fi
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+JVM_PARAMS="-Xmx512m ${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
-#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
-#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
-DEMO_ARGS="-n ${ISPN_HOME}/etc/Amazon-TestData/influenza_na.dat"
+DEMO_ARGS="${DEMO_ARGS} -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
+DEMO_ARGS="${DEMO_ARGS} -n ${ISPN_HOME}/etc/Amazon-TestData/influenza_na.dat"
+
java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,14 +21,14 @@
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"
+if [ ! -e ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat ]; then
+ gunzip ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat.gz > /dev/null
+fi
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+JVM_PARAMS="${JVM_PARAMS} -Xmx512m -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
-#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
-#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
-DEMO_ARGS="-p ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat"
+DEMO_ARGS="${DEMO_ARGS} -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
+DEMO_ARGS="${DEMO_ARGS} -p ${ISPN_HOME}/etc/Amazon-TestData/influenza_aa.dat"
+
java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,14 +21,10 @@
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"
+JVM_PARAMS="-Xmx512m ${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
+DEMO_ARGS="${DEMO_ARGS} -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
+DEMO_ARGS="${DEMO_ARGS} -q "
-#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
-#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
-#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
-DEMO_ARGS="-q "
java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh 2010-05-25 11:14:50 UTC (rev 1837)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh 2010-05-25 11:16:45 UTC (rev 1838)
@@ -21,15 +21,11 @@
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"
+JVM_PARAMS="-Xmx512m ${JVM_PARAMS} -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:${ISPN_HOME}/etc/log4j.xml"
+JVM_PARAMS="${JVM_PARAMS} -DCFGPath=${ISPN_HOME}/etc/config-samples/ec2-demo/"
-# Sample JPDA settings for remote socket debuging
-#JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"
-
-#Load protein file => -p e.g. -p /opt/influenza-data-files/influenza_aa.dat
-#Load nucleotide file => -n e.g. -n /opt/influenza-data-files/influenza_na.dat
-#Load Influenze virus file => -i e.g. -i /opt/influenza-data-files/influenza.dat
+DEMO_ARGS=" -c ${ISPN_HOME}/etc/config-samples/ec2-demo/infinispan-ec2-config.xml"
DEMO_ARGS="${DEMO_ARGS} -r "
DEMO_ARGS="${DEMO_ARGS} -i ${ISPN_HOME}/etc/Amazon-TestData/influenza.dat"
+
java -cp ${CP} ${JVM_PARAMS} org.infinispan.ec2demo.InfinispanFluDemo ${DEMO_ARGS}
More information about the infinispan-commits
mailing list