geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r900431 - in /geronimo/sandbox/failover: controller-as-repo/ failover-tomcat-demo/ failover-tomcat-demo/src/main/resources/ failover-tomcat-demo/src/main/resources/grinder-3.0.1/ geronimo-tomcat-farm-controller/ load-beans/
Date Mon, 18 Jan 2010 15:49:31 GMT
Author: kevan
Date: Mon Jan 18 15:49:30 2010
New Revision: 900431

URL: http://svn.apache.org/viewvc?rev=900431&view=rev
Log:
Updates/fixes to failover demo. Assuming I haven't missed any new files, this builds/runs
fine on Mac OS. It does leave the terminal shell in a funny state, after exiting, however.

Added:
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/distribute.gsh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh   (with props)
Modified:
    geronimo/sandbox/failover/controller-as-repo/pom.xml
    geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh
    geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml
    geronimo/sandbox/failover/load-beans/pom.xml

Modified: geronimo/sandbox/failover/controller-as-repo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/controller-as-repo/pom.xml?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/controller-as-repo/pom.xml (original)
+++ geronimo/sandbox/failover/controller-as-repo/pom.xml Mon Jan 18 15:49:30 2010
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>controller-as-repo</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>car</packaging>
 
     <properties>

Modified: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/pom.xml?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/pom.xml (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/pom.xml Mon Jan 18 15:49:30 2010
@@ -32,7 +32,7 @@
 -->
     <groupId>org.apache.geronimo.failover</groupId>
     <artifactId>failover-tomcat-demo</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging> 
 
     <name>Geronimo Demos :: Failover on Tomcat</name>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.superbiz</groupId> 
             <artifactId>load-beans</artifactId>
-            <version>1.0</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

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=900431&r1=900430&r2=900431&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 Jan 18 15:49:30
2010
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-echo unpack controller server
-tar xzf geronimo-tomcat-farm-controller-2.2-bin.tar.gz
+## set host, demoVersion, geronimoVersion to appropriate values 
+. ./initEnv.sh
 
-host=$(./hostname.sh)
+echo unpack controller server
+tar xzf geronimo-tomcat-farm-controller-$demoVersion-bin.tar.gz
 
 echo start controller server in background
-./geronimo-tomcat-farm-controller-2.2/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &
+./geronimo-tomcat-farm-controller-$demoVersion/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &
 
 echo wait 20 seconds for controller to start
 sleep 20
@@ -19,7 +20,12 @@
 sleep 20
 
 echo deploy the app, distribute it to the farm
-./geronimo-tomcat-farm-controller-2.2/bin/gsh<deploy.gsh
+# running deploy/distribute and cluster/deploy at same time doesn't work for me.
+# so run them separately
+#./geronimo-tomcat-farm-controller-$demoVersion/bin/gsh<deploy.gsh
+./geronimo-tomcat-farm-controller-$demoVersion/bin/gsh<distribute.gsh
+./geronimo-tomcat-farm-controller-$demoVersion/bin/gsh<clusterdeploy.gsh
+
 
 # gshell (jline) seems to leave the terminal in a strage state
 # so reset it

Added: 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=900431&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/clusterdeploy.gsh Mon
Jan 18 15:49:30 2010
@@ -0,0 +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


Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh Mon
Jan 18 15:49:30 2010
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-host=$(./hostname.sh)
+. ./initEnv.sh
 
 # Split out as a separate function to avoid output like:
 # "./cycleservers.sh: line 3:  8472 Killed                  ./bin/gsh geronimo/start-server
...."
@@ -8,7 +8,7 @@
     ./bin/gsh geronimo/start-server -G server.name=${server} -G config.substitution.ServerHostname=$host
-G config.substitution.PortOffset=${s}0 &> ${s}.log 
 }
 
-(cd geronimo-plugin-farm-node-2.2
+(cd geronimo-plugin-farm-node-$geronimoVersion
 
 while true; do
 

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh Mon Jan 18
15:49:30 2010
@@ -1,3 +1,3 @@
 #gshell script
 deploy/distribute load-beans-1.0.jar --username system --password manager
-cluster/deploy add -c cluster1 -l pluginList1 -a  org.superbiz/load-beans/1.0/car 
+cluster/deploy add --cluster cluster1 --pluginlist pluginlist1 --pluginartifact org.superbiz/load-beans/1.0/car


Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/distribute.gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/distribute.gsh?rev=900431&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/distribute.gsh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/distribute.gsh Mon Jan
18 15:49:30 2010
@@ -0,0 +1,2 @@
+#gshell script
+deploy/distribute load-beans-1.0-SNAPSHOT.jar --username system --password manager

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties
(original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties
Mon Jan 18 15:49:30 2010
@@ -40,10 +40,10 @@
 # Use to adjust the classpath used for the worker process JVMs. Anything
 # specified here will be prepended to the classpath used to start the Grinder
 # processes.
-grinder.jvm.classpath=../geronimo-tomcat-farm-controller-2.2/repository/org/apache/openejb/openejb-client/3.1.2/openejb-client-3.1.2.jar:\
-  ../geronimo-tomcat-farm-controller-2.2/repository/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar:\
-  ../geronimo-tomcat-farm-controller-2.2/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar:\
-  ../load-beans-1.0.jar
+grinder.jvm.classpath=../geronimo-tomcat-farm-controller-1.0-SNAPSHOT/repository/org/apache/openejb/openejb-client/3.1.2/openejb-client-3.1.2.jar:\
+  ../geronimo-tomcat-farm-controller-1.0-SNAPSHOT/repository/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar:\
+  ../geronimo-tomcat-farm-controller-1.0-SNAPSHOT/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar:\
+  ../load-beans-1.0-SNAPSHOT.jar
 
 # Additional arguments to worker process JVMs.
 #grinder.jvm.arguments = -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005

Added: 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=900431&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh Mon Jan 18
15:49:30 2010
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+demoVersion=1.0-SNAPSHOT
+geronimoVersion=2.2
+host=$(./hostname.sh)
\ No newline at end of file

Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/initEnv.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh Mon Jan 18
15:49:30 2010
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-host=$(./hostname.sh)
+. ./initEnv.sh
 
-BASE=geronimo-plugin-farm-node-2.2
+BASE=geronimo-plugin-farm-node-$geronimoVersion
 if  [ "$1" = "stop" ] ; then
 (
   cd $BASE

Modified: geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml (original)
+++ geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml Mon Jan 18 15:49:30
2010
@@ -30,7 +30,7 @@
     <artifactId>geronimo-tomcat-farm-controller</artifactId>
     <name>Geronim Plugin Farm Controller Server Assembly for Tomcat</name>
     <packaging>server-assembly</packaging>
-    <version>2.3-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <description>An assembly that extends the tomcat javaee assembly with the plugin
farm controller plugin.
     </description>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>controller-as-repo</artifactId>
-            <version>2.2-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 

Modified: geronimo/sandbox/failover/load-beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/load-beans/pom.xml?rev=900431&r1=900430&r2=900431&view=diff
==============================================================================
--- geronimo/sandbox/failover/load-beans/pom.xml (original)
+++ geronimo/sandbox/failover/load-beans/pom.xml Mon Jan 18 15:49:30 2010
@@ -24,7 +24,7 @@
   <groupId>org.superbiz</groupId>
   <artifactId>load-beans</artifactId>
   <packaging>jar</packaging>
-  <version>1.0</version>
+  <version>1.0-SNAPSHOT</version>
   <name>OpenEJB :: Load Beans</name>
   <build>
     <defaultGoal>install</defaultGoal>



Mime
View raw message