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

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

Author: ataylor
Date: 2008-11-24 05:29:19 -0500 (Mon, 24 Nov 2008)
New Revision: 5422

Modified:
   trunk/build-messaging.xml
   trunk/src/bin/run.bat
   trunk/src/bin/run.sh
Log:
fixed distro target in build

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2008-11-24 09:19:45 UTC (rev 5421)
+++ trunk/build-messaging.xml	2008-11-24 10:29:19 UTC (rev 5422)
@@ -628,8 +628,13 @@
 
       <copy todir="${build.distro.lib.dir}">
          <fileset dir="${build.jars.dir}">
-            <include name="jboss-${module.name}-client.jar"/>
-            <include name="jboss-${module.name}.jar"/>
+            <include name="${core.jar.name}"/>
+            <include name="${jms.jar.name}"/>
+            <include name="${transports.jar.name}"/>
+            <include name="${security.jar.name}"/>
+            <include name="${bootstrap.jar.name}"/>
+            <include name="${logging.jar.name}"/>
+            <include name="${core.client..jar.name}"/>
          </fileset>
          <fileset dir="${jboss.microcontainer.lib}">
             <include name="jboss-container.jar"/>
@@ -693,8 +698,8 @@
          <fileset dir="${apache.mina.lib}">
             <include name="mina-core-2.0.0-M3-20080730.120633-1.jar"/>
          </fileset>
-         <fileset dir="${netty.lib}">
-            <include name="netty-3.0.0.CR3.jar"/>
+         <fileset dir="${netty.netty.lib}">
+            <include name="netty-3.0.1.GA.jar"/>
          </fileset>
          <fileset dir="${slf4j.api.lib}">
             <include name="slf4j-api-1.4.3.jar"/>
@@ -708,6 +713,7 @@
          <fileset dir="${src.config.dir}">
             <include name="*.xml"/>
             <include name="jndi.properties"/>
+            <include name="logging.properties"/>
          </fileset>
          <fileset dir="${test.dir}/config">
             <include name="messaging.keystore"/>

Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat	2008-11-24 09:19:45 UTC (rev 5421)
+++ trunk/src/bin/run.bat	2008-11-24 10:29:19 UTC (rev 5422)
@@ -2,16 +2,16 @@
 setlocal ENABLEDELAYEDEXPANSION
 set JBM_HOME=..
 set CLASSPATH=%JBM_HOME%\config\
-set JVM_ARGS=-XX:+UseParallelGC -Xms512M -Xmx1024M -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=.
-REM export JVM_ARGS="-Xmx512M -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+set JVM_ARGS=-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=%JBM_HOME%\config\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=.
+REM export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=%JBM_HOME%\config\logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
 for /R ..\lib %%A in (*.jar) do (	
 SET CLASSPATH=!CLASSPATH!;%%A
 )
 
 echo ***********************************************************************************
-echo "java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.jms.server.microcontainer.JBMBootstrapServer jbm-standalone-beans.xml"
+echo "java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml"
 echo ***********************************************************************************
-java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.microcontainer.JBMBootstrapServer jbm-standalone-beans.xml
+java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml
 
 
 

Modified: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh	2008-11-24 09:19:45 UTC (rev 5421)
+++ trunk/src/bin/run.sh	2008-11-24 10:29:19 UTC (rev 5422)
@@ -1,11 +1,11 @@
 export JBM_HOME=..
 export CLASSPATH=$JBM_HOME/config/
-export JVM_ARGS="-XX:+UseParallelGC -Xms512M -Xmx1024M -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=."
-#export JVM_ARGS="-Xmx512M -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
+export JVM_ARGS="-XX:+UseParallelGC -Xms512M -Xmx1024M -Djava.util.logging.config.file=$JBM_HOME/cdconfig/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=."
+#export JVM_ARGS="-Xmx512M -Djava.util.logging.config.file=$JBM_HOME/cdconfig/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.library.path=. -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"
 for i in `ls $JBM_HOME/lib/*.jar`; do
 	CLASSPATH=$i:$CLASSPATH
 done
 echo ***********************************************************************************
-echo "java $JVM_ARGS -classpath $CLASSPATH org.jboss.jms.server.microcontainer.JBMBootstrapServer jbm-standalone-beans.xml"
+echo "java $JVM_ARGS -classpath $CLASSPATH org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml"
 echo ***********************************************************************************
-java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote org.jboss.messaging.microcontainer.JBMBootstrapServer jbm-standalone-beans.xml
\ No newline at end of file
+java $JVM_ARGS -classpath $CLASSPATH -Dcom.sun.management.jmxremote org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-standalone-beans.xml
\ No newline at end of file