From a51ffed37fcb39834384802717d0829791c46f69 Mon Sep 17 00:00:00 2001
From: pferraro <paul.ferraro@redhat.com>
Date: Wed, 28 Oct 2009 14:29:08 +0000
Subject: [PATCH] Complete mod-cluster -> mod_cluster rename.

---
 README.txt                         |  6 ++---
 build-jbossweb.xml                 |  2 +-
 build-test.xml                     | 42 +++++++++++++++---------------
 local.properties                   |  2 +-
 release.txt                        |  2 +-
 test/java/build.properties.default |  2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/README.txt b/README.txt
index 12eee97d7..e271b917f 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-mod-cluster
+mod_cluster
 ===========
 
 Instructions
@@ -6,7 +6,7 @@ Instructions
 
 JBoss AS
 
-1. Copy the exploded sar "mod-cluster.sar" directory into the deploy directory
+1. Copy the exploded sar "mod_cluster.sar" directory into the deploy directory
    of a JBoss server profile.
 2. Modify the server.xml within jbossweb.sar and add a clustered mode engine
    listener as documented here:
@@ -15,7 +15,7 @@ JBoss AS
 
 JBoss Web
 
-1. Copy the jar file contained in the mod-cluster.sar directory into the lib
+1. Copy the jar file contained in the mod_cluster.sar directory into the lib
    directory of your JBoss Web installation.
 2. Copy the following dependency jars into the same lib directory:
 
diff --git a/build-jbossweb.xml b/build-jbossweb.xml
index 4a4df2631..f6e65ff06 100644
--- a/build-jbossweb.xml
+++ b/build-jbossweb.xml
@@ -46,6 +46,6 @@
          <include name="jboss-logging-jdk.jar"/>
   	    </fileset>
   	  </copy>
-     <copy tofile="${out.lib}/mod-cluster.jar" file="${target.dir}/${mod-cluster.jar.name}.jar"/>
+     <copy tofile="${out.lib}/mod_cluster.jar" file="${target.dir}/${mod_cluster.jar.name}.jar"/>
   </target>
 </project>
diff --git a/build-test.xml b/build-test.xml
index e651cbdde..18ceb8784 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -98,7 +98,7 @@
   <property name="location.dependencies.lib.org.jboss.logging:jboss-logging-spi" value="${location.dependencies.lib}/jboss-logging-spi.jar" />
   <property name="location.apache.httpd" value="/usr/sbin"/>
   <property name="location.apache.serverroot" value="${user.home}/httpd"/>
-  <property name="location.apache.config" value="conf/mod-cluster-httpd.conf"/>
+  <property name="location.apache.config" value="conf/mod_cluster-httpd.conf"/>
   
   <path id="server.taskdef.classpath">
     <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}"/>
@@ -111,7 +111,7 @@
   <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" />
 
   <!-- Module name(s) & version -->
-  <property name="module.name" value="mod-cluster" />
+  <property name="module.name" value="mod_cluster" />
   <property name="module.Name" value="JBoss Testsuite" />
   <property name="module.version" value="DEV" />
   <property name="module.source" value="${basedir}/src" />
@@ -127,7 +127,7 @@
   <property name="build.reports" value="${module.output}/reports"/>
   <property name="build.testlog" value="${module.output}/log"/>
   
-  <!-- Define common JVM Arguments for all mod-cluster JBossAS Runtimes -->
+  <!-- Define common JVM Arguments for all mod_cluster JBossAS Runtimes -->
   <property name="mod_cluster.jboss.jvmargs" value="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Djava.net.preferIPv4Stack=true -Dresolve.dns=false" />
 
   <property name="junit.timeout" value="300000"/>
@@ -137,28 +137,28 @@
   -->
   <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" udpGroup="${udpGroup}">
 
-    <server name="mod-cluster-0" host="${node0}">
+    <server name="mod_cluster-0" host="${node0}">
       <jvmarg value="${mod_cluster.jboss.jvmargs}" />
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       <sysproperty key="jboss.messaging.ServerPeerID" value="0" />
     </server>
 
-    <server name="mod-cluster-1" host="${node1}">
+    <server name="mod_cluster-1" host="${node1}">
       <jvmarg value="${mod_cluster.jboss.jvmargs}" />
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       <sysproperty key="jboss.messaging.ServerPeerID" value="1" />
     </server>
 
-    <server name="mod-cluster-2" host="${node2}">
+    <server name="mod_cluster-2" host="${node2}">
       <jvmarg value="${mod_cluster.jboss.jvmargs}" />
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
       <sysproperty key="jboss.messaging.ServerPeerID" value="2" />
     </server>
 
-    <server name="mod-cluster-3" host="${node3}">
+    <server name="mod_cluster-3" host="${node3}">
       <jvmarg value="${mod_cluster.jboss.jvmargs}" />
       <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
       <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -213,7 +213,7 @@
     <attribute name="location" default="/usr/sbin"/>
     <attribute name="action-type" default="start"/>
     <attribute name="server-root"/>
-    <attribute name="config" default="conf/mod-cluster-httpd.conf"/>
+    <attribute name="config" default="conf/mod_cluster-httpd.conf"/>
     <attribute name="failonerror" default="true"/>
      
     <sequential>
@@ -288,9 +288,9 @@
     </condition>
     
     <echo message="Setting up httpd config in ${location.apache.serverroot}"/>
-    <create-httpd server-root="${location.apache.serverroot}" newconf-src="mod-cluster-httpd"/>
+    <create-httpd server-root="${location.apache.serverroot}" newconf-src="mod_cluster-httpd"/>
     
-    <create-config baseconf="all" newconf="mod-cluster-0" newconf-src="mod-cluster-jbossas">         
+    <create-config baseconf="all" newconf="mod_cluster-0" newconf-src="mod_cluster-jbossas">         
       <patternset id="jboss.server.all.includes">
         <include name="conf/**" />
         <include name="deploy/**" />
@@ -300,11 +300,11 @@
       </patternset>        
     </create-config>
     
-    <copy todir="${jboss.dist}/server/mod-cluster-0/deploy">
-      <fileset dir="${location.target}/mod-cluster.sar"></fileset>
+    <copy todir="${jboss.dist}/server/mod_cluster-0/deploy">
+      <fileset dir="${location.target}/mod_cluster.sar"></fileset>
     </copy>
     
-    <create-config baseconf="all" newconf="mod-cluster-1" newconf-src="mod-cluster-jbossas">        
+    <create-config baseconf="all" newconf="mod_cluster-1" newconf-src="mod_cluster-jbossas">        
       <patternset id="jboss.server.all.includes">
         <include name="conf/**" />
         <include name="deploy/**" />
@@ -314,16 +314,16 @@
       </patternset>
     </create-config>
     
-    <copy todir="${jboss.dist}/server/mod-cluster-1/deploy">
-      <fileset dir="${location.target}/mod-cluster.sar"></fileset>
+    <copy todir="${jboss.dist}/server/mod_cluster-1/deploy">
+      <fileset dir="${location.target}/mod_cluster.sar"></fileset>
     </copy>
     
     <!--httpd location="${location.apache.httpd}" server-root="${location.apache.serverroot}" 
            config="${location.apache.config}" action-type="start" /-->  
     
     
-    <server:start name="mod-cluster-0" />
-    <!--server:start name="mod-cluster-1" /-->
+    <server:start name="mod_cluster-0" />
+    <!--server:start name="mod_cluster-1" /-->
     
     <echo message="Nodes have started, waiting for cluster to stablize..." />
 
@@ -335,8 +335,8 @@
       <param name="tests-clustering-unit.failure.property" value="${apache.integration.junit.failure.property}"/>
     </antcall>
 
-    <server:stop name="mod-cluster-0" />
-    <!--server:stop name="mod-cluster-1" /-->
+    <server:stop name="mod_cluster-0" />
+    <!--server:stop name="mod_cluster-1" /-->
 
     <!--httpd location="${location.apache.httpd}" server-root="${location.apache.serverroot}" 
            config="${location.apache.config}" action-type="stop" /-->
@@ -425,8 +425,8 @@
       <param name="cluster.includes.refid" value="one.test.includes" />
       <param name="jboss-junit-configuration" value="${jboss-junit-configuration}" />
       <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache" />
-      <param name="jbosstest.cluster.node0.config" value="mod-cluster-0" />
-      <param name="jbosstest.cluster.node1.config" value="mod-cluster-1" />
+      <param name="jbosstest.cluster.node0.config" value="mod_cluster-0" />
+      <param name="jbosstest.cluster.node1.config" value="mod_cluster-1" />
     </antcall>
 
   </target>
diff --git a/local.properties b/local.properties
index 984954c8c..471bff312 100644
--- a/local.properties
+++ b/local.properties
@@ -40,7 +40,7 @@ rmic.debug=true
 # Location of the httpd binary and the httpd serverroot
 #location.apache.httpd=/usr/sbin
 #location.apache.serverroot=${user.home}/httpd
-#location.apache.config=conf/mod-cluster-httpd.conf
+#location.apache.config=conf/mod_cluster-httpd.conf
 
 # Location of JBoss
 jboss.dist=${env.JBOSS_HOME}
diff --git a/release.txt b/release.txt
index 4eaa16c2b..b8f0c16c1 100644
--- a/release.txt
+++ b/release.txt
@@ -14,7 +14,7 @@ expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.GA
 mod_cluster is a new httpd-based load balancer for use with JBoss AS, JBoss Web, and Tomcat.
 
 Get it here:
-http://www.jboss.org/mod_cluster/downloads/mod-cluster/
+http://www.jboss.org/mod_cluster/downloads/latest/
 
 Change log:
 http://www.jboss.org/mod_cluster/changelog.html
diff --git a/test/java/build.properties.default b/test/java/build.properties.default
index 9a42dac5f..12baf5b43 100644
--- a/test/java/build.properties.default
+++ b/test/java/build.properties.default
@@ -45,4 +45,4 @@ base-jboss-ejb-api.home=${base.path}/${jboss-ejb-api.version}/lib
 jboss-ejb-api.jar.loc=${base-jboss.loc}/jboss-ejb-api/${jboss-ejb-api.version}/jboss-ejb-api-${jboss-ejb-api.version}.jar
 jboss-ejb-api.jar=${base.path}/${jboss-ejb-api.version}/jboss-ejb-api-spi-${jboss-ejb-api.version}.jar
 
-mod_cluster.jar=../../target/mod-cluster-${build_version}.jar
+mod_cluster.jar=../../target/mod_cluster-${build_version}.jar