geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r890934 - in /geronimo/sandbox/failover: failover-tomcat-demo/ failover-tomcat-demo/src/main/resources/ geronimo-tomcat-farm-controller/ load-beans/
Date Tue, 15 Dec 2009 18:37:17 GMT
Author: dblevins
Date: Tue Dec 15 18:37:16 2009
New Revision: 890934

URL: http://svn.apache.org/viewvc?rev=890934&view=rev
Log:
Various updates and tweeks to scripts and pom versions

Added:
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname.sh   (with
props)
Removed:
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname
Modified:
    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/servers.sh
    geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml
    geronimo/sandbox/failover/load-beans/pom.xml

Modified: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/pom.xml?rev=890934&r1=890933&r2=890934&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/pom.xml (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/pom.xml Tue Dec 15 18:37:16 2009
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-tomcat-farm-controller</artifactId>
-            <version>${geronimo.version}</version>
+            <version>${pom.version}</version>
             <classifier>bin</classifier>
             <type>tar.gz</type>
         </dependency>
@@ -98,7 +98,7 @@
         </plugins>
     </build>
     <properties>
-        <geronimo.version>2.2-SNAPSHOT</geronimo.version>
+        <geronimo.version>2.2</geronimo.version>
     </properties>
 
 </project>

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=890934&r1=890933&r2=890934&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 Tue Dec 15 18:37:16
2009
@@ -3,7 +3,7 @@
 echo unpack controller server
 tar xzf geronimo-tomcat-farm-controller-2.2-SNAPSHOT-bin.tar.gz
 
-host=$(cat hostname)
+host=$(./hostname.sh)
 
 echo start controller server in background
 ./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &

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=890934&r1=890933&r2=890934&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 Tue
Dec 15 18:37:16 2009
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-host=$(cat hostname)
+host=$(./hostname.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-SNAPSHOT
+(cd geronimo-plugin-farm-node-2.2
 
 while true; do
 

Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname.sh?rev=890934&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname.sh (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname.sh Tue Dec
15 18:37:16 2009
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+## The approach to getting the hostname or ip to which
+## things are bound can have a direct affect on things
+## working or not.
+##
+## This script simply needs to print the desired host
+## or IP name for binding using any mechanism that works
+## including a simple "echo" of an IP.
+
+## The default approach
+hostname
+
+## Alternate "static" approach
+#echo 192.168.1.3
\ No newline at end of file

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

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

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=890934&r1=890933&r2=890934&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 Tue Dec 15
18:37:16 2009
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-host=$(cat hostname)
+host=$(./hostname.sh)
 
-BASE=geronimo-plugin-farm-node-2.2-SNAPSHOT
+BASE=geronimo-plugin-farm-node-2.2
 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=890934&r1=890933&r2=890934&view=diff
==============================================================================
--- geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml (original)
+++ geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml Tue Dec 15 18:37:16
2009
@@ -23,13 +23,14 @@
     <parent>
         <artifactId>clustering</artifactId>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.assemblies</groupId>
     <artifactId>geronimo-tomcat-farm-controller</artifactId>
     <name>Geronim Plugin Farm Controller Server Assembly for Tomcat</name>
     <packaging>server-assembly</packaging>
+    <version>2.2-SNAPSHOT</version>
 
     <description>An assembly that extends the tomcat javaee assembly with the plugin
farm controller plugin.
     </description>

Modified: geronimo/sandbox/failover/load-beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/load-beans/pom.xml?rev=890934&r1=890933&r2=890934&view=diff
==============================================================================
--- geronimo/sandbox/failover/load-beans/pom.xml (original)
+++ geronimo/sandbox/failover/load-beans/pom.xml Tue Dec 15 18:37:16 2009
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>3.0</version>
+      <version>3.1.2</version>
       <scope>test</scope>
     </dependency>
     <!-- END SNIPPET: openejbdep -->



Mime
View raw message