[infinispan-commits] Infinispan SVN: r1256 - in trunk/demos/ec2/src/main: resources and 2 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Mon Dec 7 07:13:25 EST 2009 

Author: manik.surtani at jboss.com
Date: 2009-12-07 07:13:25 -0500 (Mon, 07 Dec 2009)
New Revision: 1256

Added:
   trunk/demos/ec2/src/main/resources/config-samples/
   trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/
   trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml
   trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml
   trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-s3_ping-aws.xml
   trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/smooks-config.xml
Removed:
   trunk/demos/ec2/src/main/resources/infinispan-config.xml
   trunk/demos/ec2/src/main/resources/jgroups-gossiprouter-aws.xml
   trunk/demos/ec2/src/main/resources/jgroups-s3_ping-aws.xml
   trunk/demos/ec2/src/main/resources/smooks-config.xml
Modified:
   trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
   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:
Updated so that config files dont overlap with other modules

Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java	2009-12-07 12:13:25 UTC (rev 1256)
@@ -25,7 +25,7 @@
    @SuppressWarnings("unchecked")
    public List<Nucleotide_Protein_Element> parseFile(String fileName) throws IOException, SAXException {
       System.out.println("Parsing [" + fileName + "]");
-      Smooks smooks = new Smooks("smooks-config.xml");
+      Smooks smooks = new Smooks("config-samples/ec2-demo/smooks-config.xml");
 
       try {
          JavaResult result = new JavaResult();

Copied: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml (from rev 1254, trunk/demos/ec2/src/main/resources/infinispan-config.xml)
===================================================================
--- trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml	                        (rev 0)
+++ trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+	<global>
+		<asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+			<properties>
+				<property name="maxThreads" value="15" />
+				<property name="threadNamePrefix" value="AsyncListenerThread" />
+			</properties>
+		</asyncListenerExecutor>
+		<asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
+			<properties>
+				<property name="maxThreads" value="25" />
+				<property name="threadNamePrefix" value="AsyncSerializationThread" />
+			</properties>
+		</asyncTransportExecutor>
+		<evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+			<properties>
+				<property name="threadNamePrefix" value="EvictionThread" />
+			</properties>
+		</evictionScheduledExecutor>
+		<replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
+			<properties>
+				<property name="threadNamePrefix" value="ReplicationQueueThread" />
+			</properties>
+		</replicationQueueScheduledExecutor>
+		<globalJmxStatistics enabled="true" jmxDomain="infinispan" />
+
+		<transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" />
+		<transport clusterName="infinispan-cluster" distributedSyncTimeout="50000">
+			<properties>
+				<property name="configurationFile" value="jgroups-s3_ping-aws.xml" />
+			</properties>
+		</transport>
+		<serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0" />
+		<shutdown hookBehavior="DEFAULT" />
+	</global>
+
+	<!-- *************************** -->
+	<!-- Default "template" settings -->
+	<!-- *************************** -->
+	<!-- this is used as a "template" configuration for all caches in the system. -->
+	<default>
+		<!-- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="20000" writeSkewCheck="false"
+			concurrencyLevel="500" />
+		<transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+			syncRollbackPhase="false" syncCommitPhase="false" useEagerLocking="false" />
+		<jmxStatistics enabled="true" />
+		<lazyDeserialization enabled="false" />
+		<unsafe unreliableReturnValues="true" />
+		<invocationBatching enabled="true" />
+					<l1 enabled="true" lifespan="600000" />
+		-->
+		<clustering mode="distribution">
+			<sync replTimeout="200000" />
+			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+			<hash numOwners="3" rehashWait="60000" rehashRpcTimeout="600000" />
+
+		</clustering>
+	</default>
+
+	<!-- ************************************** -->
+	<!-- Individually configured "named" caches -->
+	<!-- ************************************** -->
+	<!-- <namedCache name="InfluenzaCache">
+		<unsafe unreliableReturnValues="true" />
+		<invocationBatching enabled="true" />
+		<clustering mode="distribution">
+			<sync replTimeout="200000" />
+			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+			<hash numOwners="2" rehashWait="60000" rehashRpcTimeout="600000" />
+			<l1 enabled="true" lifespan="600000" />
+		</clustering>
+	</namedCache>
+
+	<namedCache name="NucleotideCache">
+		<unsafe unreliableReturnValues="true" />
+		<invocationBatching enabled="true" />
+		<clustering mode="distribution">
+			<sync replTimeout="20000" />
+			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
+			<hash numOwners="2" rehashWait="120000" rehashRpcTimeout="600000" />
+			<l1 enabled="true" lifespan="600000" />
+		</clustering>
+	</namedCache>
+
+	<namedCache name="ProteinCache">
+		<unsafe unreliableReturnValues="true" />
+		<invocationBatching enabled="true" />
+		<clustering mode="distribution">
+			<sync replTimeout="20000" />
+			<stateRetrieval timeout="200000" fetchInMemoryState="false" />
+			<hash numOwners="2" rehashWait="60000" rehashRpcTimeout="600000" />
+			<l1 enabled="true" lifespan="600000" />
+		</clustering>
+	</namedCache>-->
+</infinispan>


Property changes on: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml (from rev 1254, trunk/demos/ec2/src/main/resources/jgroups-gossiprouter-aws.xml)
===================================================================
--- trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml	                        (rev 0)
+++ trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+	<TCP bind_port="7800" />
+	<TCPGOSSIP timeout="3000" initial_hosts="localhost[5555]" num_initial_members="3" />
+	<MERGE2 max_interval="30000" min_interval="10000" />
+	<FD_SOCK />
+	<FD timeout="10000" max_tries="5" shun="true" />
+	<VERIFY_SUSPECT timeout="1500" />
+	<pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+		discard_delivered_msgs="true" />
+	<UNICAST timeout="300,600,1200,2400,3600" />
+	<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000" />
+	<pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" />
+	<FC max_credits="20000000" min_threshold="0.10" />
+	<FRAG2 frag_size="60000" />
+	<pbcast.STATE_TRANSFER />
+</config>
+
+
+


Property changes on: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-gossiprouter-aws.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-s3_ping-aws.xml (from rev 1254, trunk/demos/ec2/src/main/resources/jgroups-s3_ping-aws.xml)
===================================================================
--- trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-s3_ping-aws.xml	                        (rev 0)
+++ trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-s3_ping-aws.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+	<TCP bind_port="7800" />
+	<S3_PING secret_access_key="replace with your secret access key" access_key="replace with your access key"
+		location="replace with your s3 bucket name" />
+	<MERGE2 max_interval="30000" min_interval="10000" />
+	<FD_SOCK />
+	<FD timeout="10000" max_tries="5" />
+	<VERIFY_SUSPECT timeout="1500" />
+	<pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+		discard_delivered_msgs="true" />
+	<UNICAST timeout="300,600,1200,2400,3600" />
+	<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000" />
+	<VIEW_SYNC avg_send_interval="60000" />
+	<pbcast.GMS print_local_addr="true" join_timeout="60000" view_bundling="true" />
+	<FC max_credits="20000000" min_threshold="0.10" />
+	<FRAG2 frag_size="60000" />
+	<pbcast.STATE_TRANSFER />
+	<pbcast.FLUSH timeout="0" />
+</config>


Property changes on: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/jgroups-s3_ping-aws.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Copied: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/smooks-config.xml (from rev 1254, trunk/demos/ec2/src/main/resources/smooks-config.xml)
===================================================================
--- trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/smooks-config.xml	                        (rev 0)
+++ trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/smooks-config.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+                      xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+    <csv:reader fields="GenbankAccessionNumber,Host,GenomeSequenceNumber,SubType,country,YearFound,SequenceLength,VirusName,HostAge,HostGender,FullLengthSequence" separator="&#009;">
+        <csv:listBinding beanId="customerList" class="org.infinispan.ec2demo.Nucleotide_Protein_Element"/>
+    </csv:reader>
+
+</smooks-resource-list>


Property changes on: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/smooks-config.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: trunk/demos/ec2/src/main/resources/infinispan-config.xml
===================================================================
--- trunk/demos/ec2/src/main/resources/infinispan-config.xml	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/infinispan-config.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-	<global>
-		<asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
-			<properties>
-				<property name="maxThreads" value="15" />
-				<property name="threadNamePrefix" value="AsyncListenerThread" />
-			</properties>
-		</asyncListenerExecutor>
-		<asyncTransportExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
-			<properties>
-				<property name="maxThreads" value="25" />
-				<property name="threadNamePrefix" value="AsyncSerializationThread" />
-			</properties>
-		</asyncTransportExecutor>
-		<evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
-			<properties>
-				<property name="threadNamePrefix" value="EvictionThread" />
-			</properties>
-		</evictionScheduledExecutor>
-		<replicationQueueScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
-			<properties>
-				<property name="threadNamePrefix" value="ReplicationQueueThread" />
-			</properties>
-		</replicationQueueScheduledExecutor>
-		<globalJmxStatistics enabled="true" jmxDomain="infinispan" />
-
-		<transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" />
-		<transport clusterName="infinispan-cluster" distributedSyncTimeout="50000">
-			<properties>
-				<property name="configurationFile" value="jgroups-s3_ping-aws.xml" />
-			</properties>
-		</transport>
-		<serialization marshallerClass="org.infinispan.marshall.VersionAwareMarshaller" version="1.0" />
-		<shutdown hookBehavior="DEFAULT" />
-	</global>
-
-	<!-- *************************** -->
-	<!-- Default "template" settings -->
-	<!-- *************************** -->
-	<!-- this is used as a "template" configuration for all caches in the system. -->
-	<default>
-		<!-- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="20000" writeSkewCheck="false"
-			concurrencyLevel="500" />
-		<transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
-			syncRollbackPhase="false" syncCommitPhase="false" useEagerLocking="false" />
-		<jmxStatistics enabled="true" />
-		<lazyDeserialization enabled="false" />
-		<unsafe unreliableReturnValues="true" />
-		<invocationBatching enabled="true" />
-					<l1 enabled="true" lifespan="600000" />
-		-->
-		<clustering mode="distribution">
-			<sync replTimeout="200000" />
-			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-			<hash numOwners="3" rehashWait="60000" rehashRpcTimeout="600000" />
-
-		</clustering>
-	</default>
-
-	<!-- ************************************** -->
-	<!-- Individually configured "named" caches -->
-	<!-- ************************************** -->
-	<!-- <namedCache name="InfluenzaCache">
-		<unsafe unreliableReturnValues="true" />
-		<invocationBatching enabled="true" />
-		<clustering mode="distribution">
-			<sync replTimeout="200000" />
-			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-			<hash numOwners="2" rehashWait="60000" rehashRpcTimeout="600000" />
-			<l1 enabled="true" lifespan="600000" />
-		</clustering>
-	</namedCache>
-
-	<namedCache name="NucleotideCache">
-		<unsafe unreliableReturnValues="true" />
-		<invocationBatching enabled="true" />
-		<clustering mode="distribution">
-			<sync replTimeout="20000" />
-			<stateRetrieval timeout="20000" fetchInMemoryState="false" />
-			<hash numOwners="2" rehashWait="120000" rehashRpcTimeout="600000" />
-			<l1 enabled="true" lifespan="600000" />
-		</clustering>
-	</namedCache>
-
-	<namedCache name="ProteinCache">
-		<unsafe unreliableReturnValues="true" />
-		<invocationBatching enabled="true" />
-		<clustering mode="distribution">
-			<sync replTimeout="20000" />
-			<stateRetrieval timeout="200000" fetchInMemoryState="false" />
-			<hash numOwners="2" rehashWait="60000" rehashRpcTimeout="600000" />
-			<l1 enabled="true" lifespan="600000" />
-		</clustering>
-	</namedCache>-->
-</infinispan>

Deleted: trunk/demos/ec2/src/main/resources/jgroups-gossiprouter-aws.xml
===================================================================
--- trunk/demos/ec2/src/main/resources/jgroups-gossiprouter-aws.xml	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/jgroups-gossiprouter-aws.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-	<TCP bind_port="7800" />
-	<TCPGOSSIP timeout="3000" initial_hosts="localhost[5555]" num_initial_members="3" />
-	<MERGE2 max_interval="30000" min_interval="10000" />
-	<FD_SOCK />
-	<FD timeout="10000" max_tries="5" shun="true" />
-	<VERIFY_SUSPECT timeout="1500" />
-	<pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
-		discard_delivered_msgs="true" />
-	<UNICAST timeout="300,600,1200,2400,3600" />
-	<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000" />
-	<pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" />
-	<FC max_credits="20000000" min_threshold="0.10" />
-	<FRAG2 frag_size="60000" />
-	<pbcast.STATE_TRANSFER />
-</config>
-
-
-

Deleted: trunk/demos/ec2/src/main/resources/jgroups-s3_ping-aws.xml
===================================================================
--- trunk/demos/ec2/src/main/resources/jgroups-s3_ping-aws.xml	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/jgroups-s3_ping-aws.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config>
-	<TCP bind_port="7800" />
-	<S3_PING secret_access_key="replace with your secret access key" access_key="replace with your access key"
-		location="replace with your s3 bucket name" />
-	<MERGE2 max_interval="30000" min_interval="10000" />
-	<FD_SOCK />
-	<FD timeout="10000" max_tries="5" />
-	<VERIFY_SUSPECT timeout="1500" />
-	<pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
-		discard_delivered_msgs="true" />
-	<UNICAST timeout="300,600,1200,2400,3600" />
-	<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000" />
-	<VIEW_SYNC avg_send_interval="60000" />
-	<pbcast.GMS print_local_addr="true" join_timeout="60000" view_bundling="true" />
-	<FC max_credits="20000000" min_threshold="0.10" />
-	<FRAG2 frag_size="60000" />
-	<pbcast.STATE_TRANSFER />
-	<pbcast.FLUSH timeout="0" />
-</config>

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-all.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,7 +9,7 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules/core -name "*.jar"` ; do
   CP=${CP}:${i}
@@ -21,7 +21,7 @@
 
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-influenza.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,14 +9,14 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules -name "*.jar"` ; do
   CP=${CP}:${i}
 done
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-nucleotide.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,14 +9,14 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules -name "*.jar"` ; do
   CP=${CP}:${i}
 done
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-protein.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,14 +9,14 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules -name "*.jar"` ; do
   CP=${CP}:${i}
 done
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-query.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,14 +9,14 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules -name "*.jar"` ; do
   CP=${CP}:${i}
 done
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Modified: trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh
===================================================================
--- trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/runEC2Demo-reader.sh	2009-12-07 12:13:25 UTC (rev 1256)
@@ -9,14 +9,14 @@
 fi
 export ISPN_HOME
 
-CP=${CP}:${ISPN_HOME}/etc
+CP=${CP}:${ISPN_HOME}/etc:${ISPN_HOME}/etc/config-samples/ec2-demo
 
 for i in `find ${ISPN_HOME}/modules -name "*.jar"` ; do
   CP=${CP}:${i}
 done
 
 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/jgroups-s3_ping-aws.xml"
+JVM_PARAMS="${JVM_PARAMS} -DEC2Demo-jgroups-config=${ISPN_HOME}/etc/config-samples/ec2-demo/jgroups-s3_ping-aws.xml"
 
 # Sample JPDA settings for remote socket debuging
 #JVM_PARAMS="$JVM_PARAMS -Xrunjdwp:transport=dt_socket,address=8686,server=y,suspend=n"

Deleted: trunk/demos/ec2/src/main/resources/smooks-config.xml
===================================================================
--- trunk/demos/ec2/src/main/resources/smooks-config.xml	2009-12-07 11:09:55 UTC (rev 1255)
+++ trunk/demos/ec2/src/main/resources/smooks-config.xml	2009-12-07 12:13:25 UTC (rev 1256)
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
-                      xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
-    <csv:reader fields="GenbankAccessionNumber,Host,GenomeSequenceNumber,SubType,country,YearFound,SequenceLength,VirusName,HostAge,HostGender,FullLengthSequence" separator="&#009;">
-        <csv:listBinding beanId="customerList" class="org.infinispan.ec2demo.Nucleotide_Protein_Element"/>
-    </csv:reader>
-
-</smooks-resource-list>

More information about the infinispan-commits mailing list