[jboss-cvs] JBoss Messaging SVN: r7331 - in trunk: src/bin and 1 other directory.

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

Author: jmesnil
Date: 2009-06-15 05:55:22 -0400 (Mon, 15 Jun 2009)
New Revision: 7331

Modified:
   trunk/examples/jms/clustered-standalone/build.xml
   trunk/src/bin/run.bat
   trunk/src/bin/run.sh
Log:
Cluster Standalone example

* added a "run" target to automate the example (wip: works only from the distro)
* do not export CLUSTER_PROPS in run.sh/run.bat so that the properties can be exported
  on the shell prior to call run.sh/run.bat

Modified: trunk/examples/jms/clustered-standalone/build.xml
===================================================================
--- trunk/examples/jms/clustered-standalone/build.xml	2009-06-15 09:02:11 UTC (rev 7330)
+++ trunk/examples/jms/clustered-standalone/build.xml	2009-06-15 09:55:22 UTC (rev 7331)
@@ -38,5 +38,24 @@
          <param name="jbm.example.runServer" value="false"/>
       </antcall>
    </target>
+	
+   <target name="run">
+   	<property name="bin.dir" value="../../../../bin"/>
 
+  	<sequential>
+   	  <parallel>
+        <exec dir="${bin.dir}" executable="sh">
+           <arg line="run.sh ../config/stand-alone/clustered"/>
+        </exec>
+   	  </parallel>
+  	</sequential>
+	<antcall target="runRemote"></antcall>
+ 	  <parallel>
+      <exec dir="${bin.dir}" executable="sh">
+         <arg line="stop.sh ../config/stand-alone/clustered"/>
+      </exec>
+ 	  </parallel>
+            
+   </target>
+
 </project>
\ No newline at end of file

Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat	2009-06-15 09:02:11 UTC (rev 7330)
+++ trunk/src/bin/run.bat	2009-06-15 09:55:22 UTC (rev 7331)
@@ -7,7 +7,6 @@
 SET CONFIG_DIR=%1
 )
 set CLASSPATH=%CONFIG_DIR%;%JBM_HOME%\schemas\
-set CLUSTER_PROPS=
 REM you can use the following line if you want to run with different ports
 REM set CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost -Djbm.remoting.netty.host=localhost -Djbm.remoting.netty.port=5445"
 set JVM_ARGS=%CLUSTER_PROPS% -XX:+UseParallelGC  -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djbm.config.dir=%CONFIG_DIR%  -Djava.util.logging.config.file=%CONFIG_DIR%\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=.

Modified: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh	2009-06-15 09:02:11 UTC (rev 7330)
+++ trunk/src/bin/run.sh	2009-06-15 09:55:22 UTC (rev 7331)
@@ -6,7 +6,6 @@
 if [ a"$2" = a ]; then FILENAME=jbm-jboss-beans.xml; else FILENAME="$2"; fi
 
 export CLASSPATH=$CONFIG_DIR:$JBM_HOME/schemas/
-export CLUSTER_PROPS=;
 #you can use the following line if you want to run with different ports
 #export CLUSTER_PROPS="-Djnp.port=1099 -Djnp.rmiPort=1098 -Djnp.host=localhost -Djbm.remoting.netty.host=localhost -Djbm.remoting.netty.port=5445"
 export JVM_ARGS="$CLUSTER_PROPS -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djbm.config.dir=$CONFIG_DIR -Djava.util.logging.config.file=$CONFIG_DIR/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=."