You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/02/01 07:19:25 UTC
svn commit: r905185 - in
/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources: all.sh
clusterdeploy.gsh initEnv.sh startGrinderAgent.sh startGrinderConsole.sh
Author: genspring
Date: Mon Feb 1 06:19:25 2010
New Revision: 905185
URL: http://svn.apache.org/viewvc?rev=905185&view=rev
Log:
use our own ginder startup script so that we can remove ginder from the build
Added:
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh (with props)
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh (with props)
Modified:
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh
Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh?rev=905185&r1=905184&r2=905185&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh Mon Feb 1 06:19:25 2010
@@ -32,10 +32,10 @@
reset &> /dev/null
echo start grinder
-./grinder-3.0.1/bin/console &
+./startGrinderConsole.sh &
sleep 5
-./grinder-3.0.1/bin/agent
+./startGrinderAgent.sh
# you need to start the workers from the grinder console
Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh?rev=905185&r1=905184&r2=905185&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh Mon Feb 1 06:19:25 2010
@@ -1,3 +1,3 @@
#gshell script
#deploy/distribute load-beans-1.0.jar --username system --password manager
-cluster/deploy add --cluster cluster1 --pluginlist pluginlist1 --pluginartifact org.superbiz/load-beans/1.0/car
+cluster/deploy add --cluster cluster1 --pluginlist pluginlist1 --pluginartifact org.superbiz/load-beans/1.0/car --username system --password manager
Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh?rev=905185&r1=905184&r2=905185&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh Mon Feb 1 06:19:25 2010
@@ -2,4 +2,12 @@
demoVersion=1.0-SNAPSHOT
geronimoVersion=2.2
-host=$(./hostname.sh)
\ No newline at end of file
+GRINDERPATH=$(pwd)/grinder-3.0.1
+CONTROLLERPATH=$(pwd)/geronimo-tomcat-farm-controller-$demoVersion
+FARMNODEPATH=$(pwd)/geronimo-plugin-farm-node-$geronimoVersion
+TESTEJBJAR=load-beans-1.0-SNAPSHOT.jar
+TESTEJBJARFULLPATH=$(pwd)/load-beans-1.0-SNAPSHOT.jar
+host=$(./hostname.sh)
+
+GRINDERPROPERTIES=grinder.properties
+CLASSPATH=$GRINDERPATH/lib/grinder.jar:$TESTEJBJARFULLPATH:$CONTROLLERPATH/repository/org/apache/openejb/openejb-client/3.1.2/openejb-client-3.1.2.jar:$CONTROLLERPATH/repository/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar
Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh?rev=905185&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh Mon Feb 1 06:19:25 2010
@@ -0,0 +1,4 @@
+#!/bin/bash
+. ./initEnv.sh
+echo java -cp $CLASSPATH net.grinder.Grinder $GRINDERPROPERTIES
+java -cp $CLASSPATH net.grinder.Grinder $GRINDERPROPERTIES
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderAgent.sh
------------------------------------------------------------------------------
svn:executable = *
Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh?rev=905185&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh Mon Feb 1 06:19:25 2010
@@ -0,0 +1,3 @@
+#!/bin/bash
+. ./initEnv.sh
+java -cp $CLASSPATH net.grinder.Console
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/startGrinderConsole.sh
------------------------------------------------------------------------------
svn:executable = *