[jboss-cvs] JBoss Messaging SVN: r6272 - in trunk: examples/jms/common and 3 other directories.

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

Author: ataylor
Date: 2009-04-02 06:15:54 -0400 (Thu, 02 Apr 2009)
New Revision: 6272

Added:
   trunk/src/config/AS/examples-ant.properties
Modified:
   trunk/build-messaging.xml
   trunk/examples/jms/common/build.xml
   trunk/examples/jms/common/config/ant.properties
   trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
   trunk/examples/jms/common/src/org/jboss/jms/example/SpawnedJMSServer.java
Log:
examples now work in distro

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-04-02 09:54:00 UTC (rev 6271)
+++ trunk/build-messaging.xml	2009-04-02 10:15:54 UTC (rev 6272)
@@ -953,6 +953,10 @@
             <exclude name="**/build/**"/>
          </fileset>
       </copy>
+
+      <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="${src.config.dir}/AS/examples-ant.properties" overwrite="true">
+
+      </copy>
       <echo message="lib.dir=../../lib${line.separator}client.jar=../../lib/jboss-messaging-client.jar${line.separator}config.dir=../../config${line.separator}server.jar=../../lib/jboss-messaging.jar"
             file="${build.distro.examples.dir}/build.properties"/>
       <echo message="java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory${line.separator}java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"

Modified: trunk/examples/jms/common/build.xml
===================================================================
--- trunk/examples/jms/common/build.xml	2009-04-02 09:54:00 UTC (rev 6271)
+++ trunk/examples/jms/common/build.xml	2009-04-02 10:15:54 UTC (rev 6272)
@@ -58,39 +58,20 @@
    <property name="classes.dir" value="${build.dir}/classes"/>
    <property name="config.dir" value="${imported.basedir}/config"/>
    <property name="example.config.dir" value="config"/>
-   <property name="jbm.jars.dir" value="${imported.basedir}/../../../build/jars"/>
 
-   <property name="project.thirdparty" value="${imported.basedir}/../../../thirdparty"/>
-
-   <property name="logging.properties" value="${imported.basedir}/../../../src/config/logging.properties"/>
-
-   &libraries;
    <path id="jms.compilation.classpath">
       <fileset dir="${jbm.jars.dir}">
          <include name="**/*.jar"/>
       </fileset>
-      <path refid="jboss.microcontainer.classpath"/>
-      <path refid="jboss.common.classpath"/>
-      <path refid="jboss.jboss.javaee.classpath"/>
+      <fileset dir="${jars.dir}">
+         <include name="**/*.jar"/>
+      </fileset>
    </path>
 
    <path id="jms.runtime.classpath">
       <path refid="jms.compilation.classpath"/>
-      <path refid="apache.log4j.classpath"/>
       <pathelement location="${config.dir}"/>
       <pathelement location="${example.config.dir}"/>
-      <path refid="oswego.concurrent.classpath"/>
-      <path refid="apache.log4j.classpath"/>
-      <path refid="cglib.classpath"/>
-      <path refid="jboss.common.core.classpath"/>
-      <path refid="jboss.aop.classpath"/>
-      <path refid="trove.trove.classpath"/>
-      <path refid="javassist.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
-      <path refid="apache.xerces.classpath"/>
-      <path refid="apache.logging.classpath"/>
-      <path refid="jboss.jnpserver.classpath"/>
-      <path refid="netty.netty.classpath"/>
       <pathelement location="${classes.dir}"/>
    </path>
    <target name="init">

Modified: trunk/examples/jms/common/config/ant.properties
===================================================================
--- trunk/examples/jms/common/config/ant.properties	2009-04-02 09:54:00 UTC (rev 6271)
+++ trunk/examples/jms/common/config/ant.properties	2009-04-02 10:15:54 UTC (rev 6272)
@@ -1 +1,4 @@
-jbm.example.logserveroutput=true
\ No newline at end of file
+jbm.example.logserveroutput=false
+logging.properties=${imported.basedir}/../../../src/config/logging.properties
+jbm.jars.dir=${imported.basedir}/../../../build/jars
+jars.dir=${imported.basedir}/../../../thirdparty
\ No newline at end of file

Modified: trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java
===================================================================
--- trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java	2009-04-02 09:54:00 UTC (rev 6271)
+++ trunk/examples/jms/common/src/org/jboss/jms/example/JMSExample.java	2009-04-02 10:15:54 UTC (rev 6272)
@@ -146,7 +146,8 @@
       {
          String[] arg = args[i];
          log.info("starting server with config '" + arg[0] + "' " + "logServerOutput " + logServerOutput);
-         servers[i] = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), new String[]{}, logServerOutput, "STARTED::", "FAILED::", args[0]);
+         String logProps = System.getProperty("java.util.logging.config.file");
+         servers[i] = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), new String[]{"-Djava.util.logging.config.file=" + logProps}, logServerOutput, "STARTED::", "FAILED::", args[0]);
       }
    }
 

Modified: trunk/examples/jms/common/src/org/jboss/jms/example/SpawnedJMSServer.java
===================================================================
--- trunk/examples/jms/common/src/org/jboss/jms/example/SpawnedJMSServer.java	2009-04-02 09:54:00 UTC (rev 6271)
+++ trunk/examples/jms/common/src/org/jboss/jms/example/SpawnedJMSServer.java	2009-04-02 10:15:54 UTC (rev 6272)
@@ -35,7 +35,6 @@
       {
          System.setProperty("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
          System.setProperty("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
-         System.setProperty("java.util.logging.config.file", "../../../src/config/logging.properties");
          System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.messaging.integration.logging.JBMLoggerPlugin");
          bootstrap = new JBMBootstrapServer(args);
          bootstrap.run();

Added: trunk/src/config/AS/examples-ant.properties
===================================================================
--- trunk/src/config/AS/examples-ant.properties	                        (rev 0)
+++ trunk/src/config/AS/examples-ant.properties	2009-04-02 10:15:54 UTC (rev 6272)
@@ -0,0 +1,4 @@
+jbm.example.logserveroutput=false
+logging.properties=${imported.basedir}/../../../config/logging.properties
+jbm.jars.dir=${imported.basedir}/../../../lib
+jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file