[jboss-cvs] JBoss Messaging SVN: r1414 - trunk/util

[jboss-cvs-commits at lists.jboss.org]

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-30 03:44:25 -0400 (Sat, 30 Sep 2006)
New Revision: 1414

Modified:
   trunk/util/release-admin.xml
Log:
installation script tweaks

Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml	2006-09-30 07:43:42 UTC (rev 1413)
+++ trunk/util/release-admin.xml	2006-09-30 07:44:25 UTC (rev 1414)
@@ -51,9 +51,9 @@
    <!--
         A cluster node installation for JBoss 4.x.
    -->
-   <target name="cluster">
+   <target name="cluster-node">
       <set-config-name base="${messaging.config.name}" suffix="node${id}"/>
-      <antcall target="create-cluster-server-config"/>
+      <antcall target="create-cluster-node-server-config"/>
    </target>
 
    <!--
@@ -362,7 +362,7 @@
 
    </target>
 
-   <target name="create-cluster-server-config">
+   <target name="create-cluster-node-server-config">
 
       <!--
            Create the non-clustered configuration first.
@@ -375,6 +375,12 @@
       <antcall target="configure-service-binding-manager"/>
 
       <!--
+           Adjust the node id
+      -->
+      <replaceregexp file="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/messaging-service.xml" flags="s"
+         match="(\x3carg[ \t]type=\x22int\x22[ \t]*value=\x22).+?(\x22.*)" replace="\1${id}\2"/>
+
+      <!--
            Replace HSQLDB with a LAN-shareable database.
       -->
       <echo message="Enabling ${database}"/>
@@ -394,30 +400,34 @@
       <delete file="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml" quiet="false" failonerror="true"/>
       <copy file="${auxiliary.artifacts.location}/clustered-${database}-persistence-service.xml" todir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/"/>
 
-      <echo>
-######
-######
-######
-######
-######  WARNING! The configuration just created uses a generic ${database} service descriptor!
-######
-######  Check
-######
-######      ${jboss.home}/server/${config.name}/deploy/${database}-ds.xml
-######
-######  and make sure that:
-######
-######  1. Your database is indeed ${database}.
-######  2. It is accessible from every physical node you installed Messaging on.
-######  3. Contains a schema (tablespace) named 'messaging'.
-######  4. The URL (hostname and port), username and password are correct.
-######  5. The installed ${database}-driver.jar's version maches your database.
-######
-######
-######
-######
-      </echo>
 
+<echo>
+
+                    ##########################
+                    #                        #
+                    #        WARNING!        #
+                    #                        #
+                    ##########################
+
+
+ The configuration that has just been created uses a generic ${database} service descriptor!
+
+ Check
+
+      ${jboss.home}/server/${config.name}/deploy/${database}-ds.xml
+
+ and make sure that:
+
+ 1. Your database is indeed ${database}.
+ 2. It is accessible from every physical node you installed Messaging on.
+ 3. Contains a schema (database/tablespace) named 'messaging'.
+ 4. The URL (hostname and port), username and password are correct.
+ 5. The installed ${database}-driver.jar's version maches your database.
+
+
+
+</echo>
+
    </target>
 
    <target name="configure-service-binding-manager" if="ports">
@@ -519,6 +529,8 @@
    </target>
 
    <target name="test">
+      <delete file="./x.xml"/>
+      <copy file="./x.xml.orig" tofile="./x.xml"/>
    </target>
 
 </project>