[jboss-cvs] JBoss Messaging SVN: r5347 - trunk.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 13 05:43:39 EST 2008
Author: ataylor
Date: 2008-11-13 05:43:39 -0500 (Thu, 13 Nov 2008)
New Revision: 5347
Modified:
trunk/build-messaging.xml
trunk/build-thirdparty.xml
Log:
changed logger for tests and re formatted correctly
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2008-11-13 08:21:44 UTC (rev 5346)
+++ trunk/build-messaging.xml 2008-11-13 10:43:39 UTC (rev 5347)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
- <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
- ]>
+ <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+ ]>
<!-- =========================================================================================== -->
<!-- -->
@@ -37,1212 +37,1218 @@
<project default="jar" name="JBoss Messaging">
- <!--
- Module name(s) & version.
- -->
+ <!--
+ Module name(s) & version.
+ -->
- <property name="module.name" value="messaging"/>
+ <property name="module.name" value="messaging"/>
- <property name="messaging.version.major" value="2"/>
- <property name="messaging.version.minor" value="0"/>
- <property name="messaging.version.micro" value="0"/>
- <property name="messaging.version.suffix" value="alpha1"/>
- <property name="messaging.version.tag" value="alpha1"/>
- <property name="messaging.version.revision" value="0"/>
- <property name="messaging.version.incrementing" value="100"/>
- <property name="messaging.version.name" value="Stilton"/>
- <property name="messaging.version.svnurl" value="https://svn.jboss.org/repos/messaging/trunk"/>
- <property name="messaging.version.string"
- value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix} (${messaging.version.name}, ${messaging.version.incrementing})"/>
- <property name="module.version"
- value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>
+ <property name="messaging.version.major" value="2"/>
+ <property name="messaging.version.minor" value="0"/>
+ <property name="messaging.version.micro" value="0"/>
+ <property name="messaging.version.suffix" value="alpha1"/>
+ <property name="messaging.version.tag" value="alpha1"/>
+ <property name="messaging.version.revision" value="0"/>
+ <property name="messaging.version.incrementing" value="100"/>
+ <property name="messaging.version.name" value="Stilton"/>
+ <property name="messaging.version.svnurl" value="https://svn.jboss.org/repos/messaging/trunk"/>
+ <property name="messaging.version.string"
+ value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix} (${messaging.version.name}, ${messaging.version.incrementing})"/>
+ <property name="module.version"
+ value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>
- <!--jar names-->
+ <!--jar names-->
- <property name="core.jar.name" value="jbm-core.jar"/>
- <property name="jms.jar.name" value="jbm-jms.jar"/>
- <property name="transports.jar.name" value="jbm-transports.jar"/>
- <property name="security.jar.name" value="jbm-jbossas-security.jar"/>
- <property name="bootstrap.jar.name" value="jbm-bootstrap.jar"/>
- <property name="logging.jar.name" value="jbm-logging.jar"/>
- <property name="core.client..jar.name" value="jbm-core-client.jar"/>
+ <property name="core.jar.name" value="jbm-core.jar"/>
+ <property name="jms.jar.name" value="jbm-jms.jar"/>
+ <property name="transports.jar.name" value="jbm-transports.jar"/>
+ <property name="security.jar.name" value="jbm-jbossas-security.jar"/>
+ <property name="bootstrap.jar.name" value="jbm-bootstrap.jar"/>
+ <property name="logging.jar.name" value="jbm-logging.jar"/>
+ <property name="core.client..jar.name" value="jbm-core-client.jar"/>
- <!--source and build dirs-->
- <property name="build.dir" value="build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.core.classes.dir" value="${build.dir}/classes/core"/>
- <property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/>
- <property name="build.transports.classes.dir" value="${build.dir}/classes/transports"/>
- <property name="build.security.classes.dir" value="${build.dir}/classes/security"/>
- <property name="build.bootstrap.classes.dir" value="${build.dir}/classes/bootstrap"/>
- <property name="build.logging.classes.dir" value="${build.dir}/classes/logging"/>
- <property name="build.jars.dir" value="${build.dir}/jars"/>
- <property name="build.src.dir" value="${build.dir}/src"/>
- <property name="src.dir" value="src"/>
- <property name="src.main.dir" value="${src.dir}/main"/>
- <property name="src.config.dir" value="${src.dir}/config"/>
- <property name="src.bin.dir" value="${src.dir}/bin"/>
- <property name="doc.dir" value="docs"/>
- <property name="licenses.dir" value="licenses"/>
- <property name="doc.examples.dir" value="examples"/>
- <property name="doc.build.dir" value="${doc.dir}/userguide/build"/>
- <property name="build.api.dir" value="${build.dir}/api"/>
- <property name="native.bin.dir" value="native/bin"/>
- <property name="examples.dir" value="examples"/>
+ <!--source and build dirs-->
+ <property name="build.dir" value="build"/>
+ <property name="build.classes.dir" value="${build.dir}/classes"/>
+ <property name="build.core.classes.dir" value="${build.dir}/classes/core"/>
+ <property name="build.jms.classes.dir" value="${build.dir}/classes/jms"/>
+ <property name="build.transports.classes.dir" value="${build.dir}/classes/transports"/>
+ <property name="build.security.classes.dir" value="${build.dir}/classes/security"/>
+ <property name="build.bootstrap.classes.dir" value="${build.dir}/classes/bootstrap"/>
+ <property name="build.logging.classes.dir" value="${build.dir}/classes/logging"/>
+ <property name="build.jars.dir" value="${build.dir}/jars"/>
+ <property name="build.src.dir" value="${build.dir}/src"/>
+ <property name="src.dir" value="src"/>
+ <property name="src.main.dir" value="${src.dir}/main"/>
+ <property name="src.config.dir" value="${src.dir}/config"/>
+ <property name="src.bin.dir" value="${src.dir}/bin"/>
+ <property name="doc.dir" value="docs"/>
+ <property name="licenses.dir" value="licenses"/>
+ <property name="doc.examples.dir" value="examples"/>
+ <property name="doc.build.dir" value="${doc.dir}/userguide/build"/>
+ <property name="build.api.dir" value="${build.dir}/api"/>
+ <property name="native.bin.dir" value="native/bin"/>
+ <property name="examples.dir" value="examples"/>
- <property name="build.artifact"
- value="${module.name}-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}"/>
- <property name="build.distro.dir"
- value="${build.dir}/${build.artifact}"/>
- <property name="build.distro.lib.dir" value="${build.distro.dir}/lib"/>
- <property name="build.distro.config.dir" value="${build.distro.dir}/config"/>
- <property name="build.distro.bin.dir" value="${build.distro.dir}/bin"/>
- <property name="build.distro.api.dir" value="${build.distro.dir}/docs/api"/>
- <property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
- <property name="build.distro.licenses.dir" value="${build.distro.dir}/licenses"/>
+ <property name="build.artifact"
+ value="${module.name}-${messaging.version.major}.${messaging.version.minor}.${messaging.version.micro}.${messaging.version.suffix}"/>
+ <property name="build.distro.dir"
+ value="${build.dir}/${build.artifact}"/>
+ <property name="build.distro.lib.dir" value="${build.distro.dir}/lib"/>
+ <property name="build.distro.config.dir" value="${build.distro.dir}/config"/>
+ <property name="build.distro.bin.dir" value="${build.distro.dir}/bin"/>
+ <property name="build.distro.api.dir" value="${build.distro.dir}/docs/api"/>
+ <property name="build.distro.examples.dir" value="${build.distro.dir}/examples"/>
+ <property name="build.distro.licenses.dir" value="${build.distro.dir}/licenses"/>
- <!-- ======================================================================================== -->
- <!-- Thirdparty Dependency Definitions -->
- <!-- ======================================================================================== -->
+ <!-- ======================================================================================== -->
+ <!-- Thirdparty Dependency Definitions -->
+ <!-- ======================================================================================== -->
- <property name="project.thirdparty" value="thirdparty"/>
- <property name="sun.javacc.lib" value="${project.thirdparty}/sun-javacc/lib/"/>
- &libraries;
+ <property name="project.thirdparty" value="thirdparty"/>
+ <property name="sun.javacc.lib" value="${project.thirdparty}/sun-javacc/lib/"/>
+ &libraries;
- <!--
- This module is based on Java 1.5
- -->
+ <!--
+ This module is based on Java 1.5
+ -->
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
- <property name="javac.debug" value="true"/>
- <property name="javac.optimize" value="false"/>
- <property name="javac.depend" value="false"/>
- <property name="javac.verbose" value="false"/>
- <property name="javac.deprecation" value="true"/>
- <property name="javac.include.ant.runtime" value="false"/>
- <property name="javac.include.java.runtime" value="true"/>
- <property name="javac.fail.onerror" value="true"/>
+ <property name="javac.debug" value="true"/>
+ <property name="javac.optimize" value="false"/>
+ <property name="javac.depend" value="false"/>
+ <property name="javac.verbose" value="false"/>
+ <property name="javac.deprecation" value="true"/>
+ <property name="javac.include.ant.runtime" value="false"/>
+ <property name="javac.include.java.runtime" value="true"/>
+ <property name="javac.fail.onerror" value="true"/>
- <!--
- test properties
- -->
+ <!--
+ test properties
+ -->
- <property name="test.dir" value="tests"/>
- <property name="test.build.dir" value="${test.dir}/build"/>
- <property name="test.src.dir" value="${test.dir}/src"/>
- <property name="test-mask" value="*Test"/>
- <property name="test.classes.dir" value="${test.build.dir}/classes"/>
- <property name="test.output.dir" value="${test.dir}/build"/>
- <property name="test.reports.dir" value="${test.output.dir}/reports"/>
- <property name="test.stylesheets.dir" value="${test.output.dir}/stylesheets"/>
- <property name="test.src.stylesheets.dir" value="${test.src.dir}/stylesheets"/>
- <property name="test.jms.dir" value="${test.dir}/jms-tests"/>
- <property name="test.jms.build.dir" value="${test.jms.dir}/build"/>
- <property name="test.jms.src.dir" value="${test.jms.dir}/src"/>
- <property name="test.jms.classes.dir" value="${test.jms.dir}/build/classes"/>
- <property name="disable.invm" value="false"/>
+ <property name="test.dir" value="tests"/>
+ <property name="test.build.dir" value="${test.dir}/build"/>
+ <property name="test.src.dir" value="${test.dir}/src"/>
+ <property name="test-mask" value="*Test"/>
+ <property name="test.classes.dir" value="${test.build.dir}/classes"/>
+ <property name="test.output.dir" value="${test.dir}/build"/>
+ <property name="test.reports.dir" value="${test.output.dir}/reports"/>
+ <property name="test.stylesheets.dir" value="${test.output.dir}/stylesheets"/>
+ <property name="test.src.stylesheets.dir" value="${test.src.dir}/stylesheets"/>
+ <property name="test.jms.dir" value="${test.dir}/jms-tests"/>
+ <property name="test.jms.build.dir" value="${test.jms.dir}/build"/>
+ <property name="test.jms.src.dir" value="${test.jms.dir}/src"/>
+ <property name="test.jms.classes.dir" value="${test.jms.dir}/build/classes"/>
+ <property name="disable.invm" value="false"/>
- <!--
- JUnit configuration (values specified in ./build.properties have priority)
- -->
+ <!--
+ JUnit configuration (values specified in ./build.properties have priority)
+ -->
- <property name="junit.printsummary" value="true"/>
- <property name="junit.haltonerror" value="false"/>
- <property name="junit.haltonfailure" value="false"/>
- <property name="junit.fork" value="true"/>
- <property name="junit.includeantruntime" value="true"/>
- <property name="junit.timeout" value="5400000"/>
- <!-- 90 mins -->
- <property name="clustering.junit.timeout" value="9000000"/>
- <!-- 150 mins -->
- <property name="clustering.stress.junit.timeout" value="5400000"/>
- <!-- 90 mins -->
- <property name="stress.junit.timeout" value="5400000"/>
- <!-- 90 mins -->
- <property name="bridge.junit.timeout" value="5400000"/>
- <!-- 90 mins -->
+ <property name="junit.printsummary" value="true"/>
+ <property name="junit.haltonerror" value="false"/>
+ <property name="junit.haltonfailure" value="false"/>
+ <property name="junit.fork" value="true"/>
+ <property name="junit.includeantruntime" value="true"/>
+ <property name="junit.timeout" value="5400000"/>
+ <!-- 90 mins -->
+ <property name="clustering.junit.timeout" value="9000000"/>
+ <!-- 150 mins -->
+ <property name="clustering.stress.junit.timeout" value="5400000"/>
+ <!-- 90 mins -->
+ <property name="stress.junit.timeout" value="5400000"/>
+ <!-- 90 mins -->
+ <property name="bridge.junit.timeout" value="5400000"/>
+ <!-- 90 mins -->
- <property name="junit.showoutput" value="true"/>
- <property name="junit.jvm" value=""/>
- <property name="junit.jvm.options" value=""/>
- <property name="junit.formatter.usefile" value="true"/>
- <property name="junit.batchtest.todir" value="${test.reports.dir}"/>
- <property name="junit.batchtest.haltonerror" value="false"/>
- <property name="junit.batchtest.haltonfailure" value="false"/>
- <property name="junit.batchtest.fork" value="true"/>
- <property name="junit.test.haltonfailure" value="false"/>
- <property name="junit.test.haltonerror" value="false"/>
+ <property name="junit.showoutput" value="true"/>
+ <property name="junit.jvm" value=""/>
+ <property name="junit.jvm.options" value=""/>
+ <property name="junit.formatter.usefile" value="true"/>
+ <property name="junit.batchtest.todir" value="${test.reports.dir}"/>
+ <property name="junit.batchtest.haltonerror" value="false"/>
+ <property name="junit.batchtest.haltonfailure" value="false"/>
+ <property name="junit.batchtest.fork" value="true"/>
+ <property name="junit.test.haltonfailure" value="false"/>
+ <property name="junit.test.haltonerror" value="false"/>
- <path id="jms.compilation.classpath">
- <path location="${build.core.classes.dir}"/>
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="jboss.jbossts14.classpath"/>
- <path refid="jboss.integration.classpath"/>
- </path>
+ <path id="jms.compilation.classpath">
+ <path location="${build.core.classes.dir}"/>
+ <path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="jboss.jbossts14.classpath"/>
+ <path refid="jboss.integration.classpath"/>
+ </path>
- <path id="transports.compilation.classpath">
- <path location="${build.core.classes.dir}"/>
- <path refid="apache.mina.classpath"/>
- <path refid="netty.netty.classpath"/>
- </path>
+ <path id="transports.compilation.classpath">
+ <path location="${build.core.classes.dir}"/>
+ <path refid="apache.mina.classpath"/>
+ <path refid="netty.netty.classpath"/>
+ </path>
- <path id="security.compilation.classpath">
- <path location="${build.core.classes.dir}"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="jboss.jbosssx.client.classpath"/>
- <path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.jboss.jaspi.api.classpath"/>
- </path>
+ <path id="security.compilation.classpath">
+ <path location="${build.core.classes.dir}"/>
+ <path refid="jboss.integration.classpath"/>
+ <path refid="jboss.jbosssx.client.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
+ </path>
- <path id="bootstrap.compilation.classpath">
- <path location="${build.core.classes.dir}"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.common.classpath"/>
- </path>
+ <path id="bootstrap.compilation.classpath">
+ <path location="${build.core.classes.dir}"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.common.classpath"/>
+ </path>
- <path id="logging.compilation.classpath">
- <path refid="apache.log4j.classpath"/>
- <path refid="jboss.jboss.common.logging.spi.classpath"/>
- </path>
+ <path id="logging.compilation.classpath">
+ <path refid="apache.log4j.classpath"/>
+ <path refid="jboss.jboss.common.logging.spi.classpath"/>
+ </path>
- <path id="javadoc.classpath">
- <path refid="jms.compilation.classpath"/>
- <path location="${build.classes.dir}"/>
- </path>
+ <path id="javadoc.classpath">
+ <path refid="jms.compilation.classpath"/>
+ <path location="${build.classes.dir}"/>
+ </path>
- <path id="test.compilation.classpath">
- <path refid="jms.compilation.classpath"/>
- <path refid="transports.compilation.classpath"/>
- <path refid="security.compilation.classpath"/>
- <path refid="bootstrap.compilation.classpath"/>
- <path refid="junit.junit.classpath"/>
- <!--<path refid="jboss.profiler.jvmti.classpath"/>-->
- <!--<path refid="jboss.test14.classpath"/>-->
- <!--<path refid="jboss.jboss.retro.classpath"/>-->
- <path refid="easymock.easymock.classpath"/>
- <path refid="easymock.classextension.classpath"/>
- <path location="${build.jars.dir}/${jms.jar.name}"/>
- <path location="${build.jars.dir}/${transports.jar.name}"/>
- <path location="${build.jars.dir}/${security.jar.name}"/>
- <path location="${build.jars.dir}/${bootstrap.jar.name}"/>
- </path>
+ <path id="test.compilation.classpath">
+ <path refid="jms.compilation.classpath"/>
+ <path refid="transports.compilation.classpath"/>
+ <path refid="security.compilation.classpath"/>
+ <path refid="bootstrap.compilation.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <!--<path refid="jboss.profiler.jvmti.classpath"/>-->
+ <!--<path refid="jboss.test14.classpath"/>-->
+ <!--<path refid="jboss.jboss.retro.classpath"/>-->
+ <path refid="easymock.easymock.classpath"/>
+ <path refid="easymock.classextension.classpath"/>
+ <path location="${build.jars.dir}/${jms.jar.name}"/>
+ <path location="${build.jars.dir}/${transports.jar.name}"/>
+ <path location="${build.jars.dir}/${security.jar.name}"/>
+ <path location="${build.jars.dir}/${bootstrap.jar.name}"/>
+ </path>
- <path id="jms.test.compilation.classpath">
- <path refid="transports.compilation.classpath"/>
- <path refid="security.compilation.classpath"/>
- <path refid="bootstrap.compilation.classpath"/>
- <path refid="jms.compilation.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
- <!--<path refid="jboss.test14.classpath"/>-->
- <!--<path refid="jboss.jboss.retro.classpath"/>-->
- <!--<path refid="apache.ant.classpath"/>-->
- <path refid="easymock.easymock.classpath"/>
- <path location="${build.jars.dir}/${core.jar.name}"/>
- <path location="${build.jars.dir}/${jms.jar.name}"/>
- <path location="${build.jars.dir}/${transports.jar.name}"/>
- <path location="${build.jars.dir}/${security.jar.name}"/>
- <path location="${build.jars.dir}/${bootstrap.jar.name}"/>
- <path location="${build.jars.dir}/${logging.jar.name}"/>
- </path>
+ <path id="jms.test.compilation.classpath">
+ <path refid="transports.compilation.classpath"/>
+ <path refid="security.compilation.classpath"/>
+ <path refid="bootstrap.compilation.classpath"/>
+ <path refid="jms.compilation.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <!--<path refid="jboss.test14.classpath"/>-->
+ <!--<path refid="jboss.jboss.retro.classpath"/>-->
+ <!--<path refid="apache.ant.classpath"/>-->
+ <path refid="easymock.easymock.classpath"/>
+ <path location="${build.jars.dir}/${core.jar.name}"/>
+ <path location="${build.jars.dir}/${jms.jar.name}"/>
+ <path location="${build.jars.dir}/${transports.jar.name}"/>
+ <path location="${build.jars.dir}/${security.jar.name}"/>
+ <path location="${build.jars.dir}/${bootstrap.jar.name}"/>
+ <path location="${build.jars.dir}/${logging.jar.name}"/>
+ </path>
- <path id="findbugs.classpath">
- <path refid="jms.compilation.classpath"/>
- <path location="${build.jars.dir}/jboss-${module.name}.jar"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/><!--
- <path refid="jboss.test14.classpath"/>
- <path refid="jboss.jboss.retro.classpath"/>-->
- <path refid="easymock.easymock.classpath"/>
- <path refid="slf4j.api.classpath"/>
- <path refid="slf4j.log4j.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- </path>
+ <path id="findbugs.classpath">
+ <path refid="jms.compilation.classpath"/>
+ <path location="${build.jars.dir}/jboss-${module.name}.jar"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath"/>
+ <!--
+ <path refid="jboss.test14.classpath"/>
+ <path refid="jboss.jboss.retro.classpath"/>-->
+ <path refid="easymock.easymock.classpath"/>
+ <path refid="slf4j.api.classpath"/>
+ <path refid="slf4j.log4j.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ </path>
- <path id="unit.test.execution.classpath">
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${test.dir}/tmpfiles"/>
- <pathelement location="${test.classes.dir}"/>
- <pathelement location="${src.config.dir}"/>
- <path refid="test.compilation.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="slf4j.api.classpath"/>
- <path refid="slf4j.log4j.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>
+ <path id="unit.test.execution.classpath">
+ <pathelement location="${test.dir}/config"/>
+ <pathelement location="${test.dir}/tmpfiles"/>
+ <pathelement location="${test.classes.dir}"/>
+ <pathelement location="${src.config.dir}"/>
+ <path refid="test.compilation.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="slf4j.api.classpath"/>
+ <path refid="slf4j.log4j.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>
- <path id="jms.test.execution.classpath">
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.dir}"/>
- <pathelement location="${test.jms.dir}/config"/>
- <pathelement location="${test.jms.classes.dir}"/>
- <path location="${build.jars.dir}/${transports.jar.name}"/>
- <path refid="jms.test.compilation.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="slf4j.api.classpath"/>
- <path refid="slf4j.log4j.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 id="jms.test.execution.classpath">
+ <pathelement location="${test.dir}/config"/>
+ <pathelement location="${src.config.dir}"/>
+ <pathelement location="${test.jms.dir}/config"/>
+ <pathelement location="${test.jms.classes.dir}"/>
+ <path location="${build.jars.dir}/${transports.jar.name}"/>
+ <path refid="jms.test.compilation.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="slf4j.api.classpath"/>
+ <path refid="slf4j.log4j.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="dom4j.dom4j.classpath"/>-->
- <!--<path refid="jboss.microcontainer.classpath"/>-->
- <!--<path refid="jboss.jboss.security.spi.classpath"/>-->
- <!--<path refid="jboss.jboss.jaspi.api.classpath"/>-->
- <!--<path refid="jboss.integration.classpath"/>-->
- <!--<path refid="jboss.jbosssx.client.classpath"/>-->
- <!--<path refid="jboss.jboss.javaee.classpath"/>-->
- <!--<path refid="jboss.jbossts14.classpath"/>-->
- <!--<path refid="jboss.common.classpath"/>-->
- <!--<path refid="jboss.jnpserver.classpath"/>-->
- </path>
+ <!--<path refid="dom4j.dom4j.classpath"/>-->
+ <!--<path refid="jboss.microcontainer.classpath"/>-->
+ <!--<path refid="jboss.jboss.security.spi.classpath"/>-->
+ <!--<path refid="jboss.jboss.jaspi.api.classpath"/>-->
+ <!--<path refid="jboss.integration.classpath"/>-->
+ <!--<path refid="jboss.jbosssx.client.classpath"/>-->
+ <!--<path refid="jboss.jboss.javaee.classpath"/>-->
+ <!--<path refid="jboss.jbossts14.classpath"/>-->
+ <!--<path refid="jboss.common.classpath"/>-->
+ <!--<path refid="jboss.jnpserver.classpath"/>-->
+ </path>
- <path id="jms.standalone.server.classpath">
- <pathelement location="${test.dir}/config"/>
- <pathelement location="${src.config.dir}"/>
- <pathelement location="${test.jms.dir}/config"/>
- <pathelement location="${test.jms.classes.dir}"/>
- <path location="${build.jars.dir}/${transports.jar.name}"/>
- <path refid="jms.test.execution.classpath"/>
+ <path id="jms.standalone.server.classpath">
+ <pathelement location="${test.dir}/config"/>
+ <pathelement location="${src.config.dir}"/>
+ <pathelement location="${test.jms.dir}/config"/>
+ <pathelement location="${test.jms.classes.dir}"/>
+ <path location="${build.jars.dir}/${transports.jar.name}"/>
+ <path refid="jms.test.execution.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
- <!--<path refid="dom4j.dom4j.classpath"/>-->
- <!--<path refid="jboss.microcontainer.classpath"/>-->
- <!--<path refid="jboss.jboss.security.spi.classpath"/>-->
- <!--<path refid="jboss.jboss.jaspi.api.classpath"/>-->
- <!--<path refid="jboss.integration.classpath"/>-->
- <!--<path refid="jboss.jbosssx.client.classpath"/>-->
- <!--<path refid="jboss.jboss.javaee.classpath"/>-->
- <!--<path refid="jboss.jbossts14.classpath"/>-->
- <!--<path refid="jboss.common.classpath"/>-->
- <!---->
- </path>
+ <path refid="jboss.jnpserver.classpath"/>
+ <!--<path refid="dom4j.dom4j.classpath"/>-->
+ <!--<path refid="jboss.microcontainer.classpath"/>-->
+ <!--<path refid="jboss.jboss.security.spi.classpath"/>-->
+ <!--<path refid="jboss.jboss.jaspi.api.classpath"/>-->
+ <!--<path refid="jboss.integration.classpath"/>-->
+ <!--<path refid="jboss.jbosssx.client.classpath"/>-->
+ <!--<path refid="jboss.jboss.javaee.classpath"/>-->
+ <!--<path refid="jboss.jbossts14.classpath"/>-->
+ <!--<path refid="jboss.common.classpath"/>-->
+ <!---->
+ </path>
- <!--
- Setting "external.project" to true makes jbossbuild use the current directory, and not its
- parent, as project root. DO NOT change this.
- -->
- <property name="external.project" value="true"/>
- <!--
- Setting "nodownload" to true inhibits downloading of up-to-date dependencies.
- -->
- <property name="nodownload" value="false"/>
+ <!--
+ Setting "external.project" to true makes jbossbuild use the current directory, and not its
+ parent, as project root. DO NOT change this.
+ -->
+ <property name="external.project" value="true"/>
+ <!--
+ Setting "nodownload" to true inhibits downloading of up-to-date dependencies.
+ -->
+ <property name="nodownload" value="false"/>
- <target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
- <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
- </target>
+ <target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads">
+ <ant antfile="build-thirdparty.xml" target="generate-libraries-ent"/>
+ </target>
- <target name="check.inhibit.downloads">
- <condition property="inhibit.downloads">
- <or>
- <uptodate property="dependencies.current"
- srcfile="build-thirdparty.xml"
- targetfile="./thirdparty/libraries.ent"/>
- <istrue value="${nodownload}"/>
- </or>
- </condition>
- </target>
+ <target name="check.inhibit.downloads">
+ <condition property="inhibit.downloads">
+ <or>
+ <uptodate property="dependencies.current"
+ srcfile="build-thirdparty.xml"
+ targetfile="./thirdparty/libraries.ent"/>
+ <istrue value="${nodownload}"/>
+ </or>
+ </condition>
+ </target>
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${test.build.dir}"/>
- <delete dir="${test.output.dir}"/>
- <delete dir="${test.jms.build.dir}"/>
- </target>
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ <delete dir="${test.build.dir}"/>
+ <delete dir="${test.output.dir}"/>
+ <delete dir="${test.jms.build.dir}"/>
+ </target>
- <target name="init" depends="createthirdparty">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes.dir}"/>
- <mkdir dir="${build.core.classes.dir}"/>
- <mkdir dir="${build.jms.classes.dir}"/>
- <mkdir dir="${build.transports.classes.dir}"/>
- <mkdir dir="${build.security.classes.dir}"/>
- <mkdir dir="${build.bootstrap.classes.dir}"/>
- <mkdir dir="${build.logging.classes.dir}"/>
- <mkdir dir="${build.jars.dir}"/>
- <mkdir dir="${build.src.dir}"/>
- </target>
+ <target name="init" depends="createthirdparty">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes.dir}"/>
+ <mkdir dir="${build.core.classes.dir}"/>
+ <mkdir dir="${build.jms.classes.dir}"/>
+ <mkdir dir="${build.transports.classes.dir}"/>
+ <mkdir dir="${build.security.classes.dir}"/>
+ <mkdir dir="${build.bootstrap.classes.dir}"/>
+ <mkdir dir="${build.logging.classes.dir}"/>
+ <mkdir dir="${build.jars.dir}"/>
+ <mkdir dir="${build.src.dir}"/>
+ </target>
- <target name="compile" depends="compile-jms"/>
+ <target name="compile" depends="compile-jms"/>
- <target name="compile-core" depends="init">
- <mkdir dir="${build.src.dir}/org/jboss/messaging/core/filter/impl"/>
- <echo message="${sun.javacc.lib}"/>
- <javacc target="${src.main.dir}/org/jboss/messaging/core/filter/impl/FilterParser.jj"
- outputdirectory="${build.src.dir}/org/jboss/messaging/core/filter/impl"
- javacchome="${sun.javacc.lib}"
- static="false"/>
- <javac destdir="${build.core.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${build.src.dir}"/>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="**/messaging/core/**/*.java"/>
- <include name="**/messaging/util/**/*.java"/>
- </javac>
- <javah class="org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl"
- classpath="${build.core.classes.dir}" destdir="./native/src"/>
+ <target name="compile-core" depends="init">
+ <mkdir dir="${build.src.dir}/org/jboss/messaging/core/filter/impl"/>
+ <echo message="${sun.javacc.lib}"/>
+ <javacc target="${src.main.dir}/org/jboss/messaging/core/filter/impl/FilterParser.jj"
+ outputdirectory="${build.src.dir}/org/jboss/messaging/core/filter/impl"
+ javacchome="${sun.javacc.lib}"
+ static="false"/>
+ <javac destdir="${build.core.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${build.src.dir}"/>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="**/messaging/core/**/*.java"/>
+ <include name="**/messaging/util/**/*.java"/>
+ </javac>
+ <javah class="org.jboss.messaging.core.asyncio.impl.AsynchronousFileImpl"
+ classpath="${build.core.classes.dir}" destdir="./native/src"/>
- <copy file="${src.config.dir}/version.properties"
- tofile="${build.core.classes.dir}/version.properties"/>
+ <copy file="${src.config.dir}/version.properties"
+ tofile="${build.core.classes.dir}/version.properties"/>
- <!--
- <echo message="messaging.version.versionName=${messaging.version.name}${line.separator}messaging.version.majorVersion=${messaging.version.major}${line.separator}messaging.version.minorVersion=${messaging.version.minor}${line.separator}messaging.version.microVersion=${messaging.version.micro}${line.separator}messaging.version.incrementingVersion=${messaging.version.incrementing}${line.separator}messaging.version.versionSuffix=${messaging.version.suffix}${line.separator}"
- file="${build.classes.dir}/version.properties"/>
- -->
- </target>
+ <!--
+<echo message="messaging.version.versionName=${messaging.version.name}${line.separator}messaging.version.majorVersion=${messaging.version.major}${line.separator}messaging.version.minorVersion=${messaging.version.minor}${line.separator}messaging.version.microVersion=${messaging.version.micro}${line.separator}messaging.version.incrementingVersion=${messaging.version.incrementing}${line.separator}messaging.version.versionSuffix=${messaging.version.suffix}${line.separator}"
+ file="${build.classes.dir}/version.properties"/>
+ -->
+ </target>
- <target name="compile-jms" depends="compile-core">
- <javac destdir="${build.jms.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="**/jms/**/*.java"/>
- <classpath refid="jms.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-jms" depends="compile-core">
+ <javac destdir="${build.jms.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="**/jms/**/*.java"/>
+ <classpath refid="jms.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="compile-transports" depends="compile-core">
- <javac destdir="${build.transports.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="org/jboss/messaging/integration/transports/**/*.java"/>
- <classpath refid="transports.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-transports" depends="compile-core">
+ <javac destdir="${build.transports.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="org/jboss/messaging/integration/transports/**/*.java"/>
+ <classpath refid="transports.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="compile-security" depends="compile-core">
- <javac destdir="${build.security.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="org/jboss/messaging/integration/security/**/*.java"/>
- <classpath refid="security.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-security" depends="compile-core">
+ <javac destdir="${build.security.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="org/jboss/messaging/integration/security/**/*.java"/>
+ <classpath refid="security.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="compile-bootstrap" depends="compile-core">
- <javac destdir="${build.bootstrap.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="org/jboss/messaging/integration/bootstrap/**/*.java"/>
- <classpath refid="bootstrap.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-bootstrap" depends="compile-core">
+ <javac destdir="${build.bootstrap.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="org/jboss/messaging/integration/bootstrap/**/*.java"/>
+ <classpath refid="bootstrap.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="compile-logging" depends="init">
- <javac destdir="${build.logging.classes.dir}"
- target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}">
- <src>
- <pathelement path="${src.main.dir}"/>
- </src>
- <include name="org/jboss/messaging/integration/logging/**/*.java"/>
- <classpath refid="logging.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-logging" depends="init">
+ <javac destdir="${build.logging.classes.dir}"
+ target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src>
+ <pathelement path="${src.main.dir}"/>
+ </src>
+ <include name="org/jboss/messaging/integration/logging/**/*.java"/>
+ <classpath refid="logging.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="build-native">
- <exec dir="native" executable="make">
- <arg line="clean"/>
- </exec>
- <exec dir="native" executable="bash">
- <arg line="bootstrap"/>
- </exec>
- </target>
- <!-- ======================================================================================== -->
- <!-- Archival Tasks -->
- <!-- ======================================================================================== -->
+ <target name="build-native">
+ <exec dir="native" executable="make">
+ <arg line="clean"/>
+ </exec>
+ <exec dir="native" executable="bash">
+ <arg line="bootstrap"/>
+ </exec>
+ </target>
+ <!-- ======================================================================================== -->
+ <!-- Archival Tasks -->
+ <!-- ======================================================================================== -->
- <target name="jar-core" depends="compile-core">
+ <target name="jar-core" depends="compile-core">
- <jar jarfile="${build.jars.dir}/${core.jar.name}">
- <fileset dir="${build.core.classes.dir}" includes="**"/>
- <manifest>
- <attribute name="JBossMessaging-Version" value="${messaging.version.string}"/>
- <attribute name="JBossMessaging-SVN-URL" value="${messaging.version.svnurl}"/>
- </manifest>
- </jar>
+ <jar jarfile="${build.jars.dir}/${core.jar.name}">
+ <fileset dir="${build.core.classes.dir}" includes="**"/>
+ <manifest>
+ <attribute name="JBossMessaging-Version" value="${messaging.version.string}"/>
+ <attribute name="JBossMessaging-SVN-URL" value="${messaging.version.svnurl}"/>
+ </manifest>
+ </jar>
- </target>
+ </target>
- <target name="jar-jms" depends="compile-jms">
+ <target name="jar-jms" depends="compile-jms">
- <jar jarfile="${build.jars.dir}/${jms.jar.name}">
- <fileset dir="${build.jms.classes.dir}" includes="**"/>
- </jar>
+ <jar jarfile="${build.jars.dir}/${jms.jar.name}">
+ <fileset dir="${build.jms.classes.dir}" includes="**"/>
+ </jar>
- </target>
+ </target>
- <target name="jar-transports" depends="compile-transports">
+ <target name="jar-transports" depends="compile-transports">
- <jar jarfile="${build.jars.dir}/${transports.jar.name}">
- <fileset dir="${build.transports.classes.dir}" includes="**"/>
- </jar>
+ <jar jarfile="${build.jars.dir}/${transports.jar.name}">
+ <fileset dir="${build.transports.classes.dir}" includes="**"/>
+ </jar>
- </target>
+ </target>
- <target name="jar-security" depends="compile-security">
+ <target name="jar-security" depends="compile-security">
- <jar jarfile="${build.jars.dir}/${security.jar.name}">
- <fileset dir="${build.security.classes.dir}" includes="**"/>
- </jar>
+ <jar jarfile="${build.jars.dir}/${security.jar.name}">
+ <fileset dir="${build.security.classes.dir}" includes="**"/>
+ </jar>
- </target>
+ </target>
- <target name="jar-bootstrap" depends="compile-bootstrap">
+ <target name="jar-bootstrap" depends="compile-bootstrap">
- <jar jarfile="${build.jars.dir}/${bootstrap.jar.name}">
- <fileset dir="${build.bootstrap.classes.dir}" includes="**"/>
- </jar>
+ <jar jarfile="${build.jars.dir}/${bootstrap.jar.name}">
+ <fileset dir="${build.bootstrap.classes.dir}" includes="**"/>
+ </jar>
- </target>
+ </target>
- <target name="jar-logging" depends="compile-logging">
+ <target name="jar-logging" depends="compile-logging">
- <jar jarfile="${build.jars.dir}/${logging.jar.name}">
- <fileset dir="${build.logging.classes.dir}" includes="**"/>
- </jar>
+ <jar jarfile="${build.jars.dir}/${logging.jar.name}">
+ <fileset dir="${build.logging.classes.dir}" includes="**"/>
+ </jar>
- </target>
+ </target>
- <target name="jar-client" depends="compile-core">
- <jar jarfile="${build.jars.dir}/${core.client..jar.name}">
- <fileset dir="${build.core.classes.dir}">
- <include name="version.properties"/>
- <include name="org/jboss/messaging/core/client/**/*.class"/>
- <include name="org/jboss/messaging/core/exception/**/*.class"/>
- <include name="org/jboss/messaging/core/logging/**/*.class"/>
- <include name="org/jboss/messaging/core/remoting/**/*.class"/>
- <include name="org/jboss/messaging/util/**/*.class"/>
- <include name="org/jboss/messaging/core/config/**/*.class"/>
- <include name="org/jboss/messaging/core/list/**/*.class"/>
- <include name="org/jboss/messaging/core/message/**/*.class"/>
- <include name="org/jboss/messaging/core/version/**/*.class"/>
- <include name="org/jboss/messaging/core/management/**/*.class"/>
- <!-- FIXME - why are these classes in the client jar ??? -->
- <include name="org/jboss/messaging/core/server/JournalType.class"/>
- <include name="org/jboss/messaging/core/journal/EncodingSupport.class"/>
- <include name="org/jboss/messaging/core/server/ServerMessage.class"/>
- <include name="org/jboss/messaging/core/ping/**/*.class"/>
- </fileset>
- </jar>
+ <target name="jar-client" depends="compile-core">
+ <jar jarfile="${build.jars.dir}/${core.client..jar.name}">
+ <fileset dir="${build.core.classes.dir}">
+ <include name="version.properties"/>
+ <include name="org/jboss/messaging/core/client/**/*.class"/>
+ <include name="org/jboss/messaging/core/exception/**/*.class"/>
+ <include name="org/jboss/messaging/core/logging/**/*.class"/>
+ <include name="org/jboss/messaging/core/remoting/**/*.class"/>
+ <include name="org/jboss/messaging/util/**/*.class"/>
+ <include name="org/jboss/messaging/core/config/**/*.class"/>
+ <include name="org/jboss/messaging/core/list/**/*.class"/>
+ <include name="org/jboss/messaging/core/message/**/*.class"/>
+ <include name="org/jboss/messaging/core/version/**/*.class"/>
+ <include name="org/jboss/messaging/core/management/**/*.class"/>
+ <!-- FIXME - why are these classes in the client jar ??? -->
+ <include name="org/jboss/messaging/core/server/JournalType.class"/>
+ <include name="org/jboss/messaging/core/journal/EncodingSupport.class"/>
+ <include name="org/jboss/messaging/core/server/ServerMessage.class"/>
+ <include name="org/jboss/messaging/core/ping/**/*.class"/>
+ </fileset>
+ </jar>
- </target>
+ </target>
- <target name="jar"
- depends="jar-core, jar-client, jar-jms, jar-transports, jar-security, jar-bootstrap, jar-logging">
+ <target name="jar"
+ depends="jar-core, jar-client, jar-jms, jar-transports, jar-security, jar-bootstrap, jar-logging">
- </target>
+ </target>
- <!-- ======================================================================================== -->
- <!-- Distro Tasks -->
- <!-- ======================================================================================== -->
+ <!-- ======================================================================================== -->
+ <!-- Distro Tasks -->
+ <!-- ======================================================================================== -->
- <target name="distro" depends="jar, jar-client">
+ <target name="distro" depends="jar, jar-client">
- <mkdir dir="${build.distro.dir}"/>
- <mkdir dir="${build.distro.lib.dir}"/>
- <mkdir dir="${build.distro.config.dir}"/>
- <mkdir dir="${build.distro.bin.dir}"/>
- <mkdir dir="${build.distro.api.dir}"/>
- <mkdir dir="${build.distro.licenses.dir}"/>
+ <mkdir dir="${build.distro.dir}"/>
+ <mkdir dir="${build.distro.lib.dir}"/>
+ <mkdir dir="${build.distro.config.dir}"/>
+ <mkdir dir="${build.distro.bin.dir}"/>
+ <mkdir dir="${build.distro.api.dir}"/>
+ <mkdir dir="${build.distro.licenses.dir}"/>
- <copy todir="${build.distro.lib.dir}">
- <fileset dir="${build.jars.dir}">
- <include name="jboss-${module.name}-client.jar"/>
- <include name="jboss-${module.name}.jar"/>
- </fileset>
- <fileset dir="${jboss.microcontainer.lib}">
- <include name="jboss-container.jar"/>
- <include name="jboss-kernel.jar"/>
- <include name="jboss-dependency.jar"/>
- <include name="jboss-aop-mc-int.jar"/>
- </fileset>
- <fileset dir="${jboss.aop.lib}">
- <include name="jboss-aop-jdk50.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.javaee.lib}">
- <include name="jboss-javaee.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.common.logging.spi.lib}">
- <include name="jboss-common-logging-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossxb.lib}">
- <include name="jboss-xml-binding.jar"/>
- </fileset>
- <fileset dir="${jboss.integration.lib}">
- <include name="jboss-transaction-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.jaspi.api.lib}">
- <include name="jboss-jaspi-api.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.client.lib}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- <fileset dir="${jboss.common.core.lib}">
- <include name="jboss-common-core.jar"/>
- </fileset>
- <fileset dir="${apache.xerces.lib}">
- <include name="xercesImpl.jar"/>
- </fileset>
- <fileset dir="${apache.logging.lib}">
- <include name="commons-logging.jar"/>
- </fileset>
- <fileset dir="${jboss.jboss.common.logging.spi.lib}">
- <include name="jboss-common-logging-spi.jar"/>
- </fileset>
- <fileset dir="${apache.log4j.lib}">
- <include name="log4j.jar"/>
- </fileset>
- <fileset dir="${jboss.jbossts14.lib}">
- <include name="jbossjta.jar"/>
- <include name="jbossts-common.jar"/>
- <include name="jbossjta-integration.jar"/>
- </fileset>
- <fileset dir="${trove.lib}">
- <include name="trove.jar"/>
- </fileset>
- <fileset dir="${javassist.lib}">
- <include name="javassist.jar"/>
- </fileset>
- <fileset dir="${jboss.jnpserver.lib}">
- <include name="jnpserver.jar"/>
- </fileset>
- <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>
- <fileset dir="${slf4j.api.lib}">
- <include name="slf4j-api-1.4.3.jar"/>
- </fileset>
- <fileset dir="${slf4j.log4j.lib}">
- <include name="slf4j-log4j12.jar"/>
- </fileset>
- </copy>
+ <copy todir="${build.distro.lib.dir}">
+ <fileset dir="${build.jars.dir}">
+ <include name="jboss-${module.name}-client.jar"/>
+ <include name="jboss-${module.name}.jar"/>
+ </fileset>
+ <fileset dir="${jboss.microcontainer.lib}">
+ <include name="jboss-container.jar"/>
+ <include name="jboss-kernel.jar"/>
+ <include name="jboss-dependency.jar"/>
+ <include name="jboss-aop-mc-int.jar"/>
+ </fileset>
+ <fileset dir="${jboss.aop.lib}">
+ <include name="jboss-aop-jdk50.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.common.logging.spi.lib}">
+ <include name="jboss-common-logging-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossxb.lib}">
+ <include name="jboss-xml-binding.jar"/>
+ </fileset>
+ <fileset dir="${jboss.integration.lib}">
+ <include name="jboss-transaction-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.security.spi.lib}">
+ <include name="jboss-security-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.jaspi.api.lib}">
+ <include name="jboss-jaspi-api.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbosssx.client.lib}">
+ <include name="jbosssx-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss.common.core.lib}">
+ <include name="jboss-common-core.jar"/>
+ </fileset>
+ <fileset dir="${apache.xerces.lib}">
+ <include name="xercesImpl.jar"/>
+ </fileset>
+ <fileset dir="${apache.logging.lib}">
+ <include name="commons-logging.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.common.logging.spi.lib}">
+ <include name="jboss-common-logging-spi.jar"/>
+ </fileset>
+ <fileset dir="${apache.log4j.lib}">
+ <include name="log4j.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossts14.lib}">
+ <include name="jbossjta.jar"/>
+ <include name="jbossts-common.jar"/>
+ <include name="jbossjta-integration.jar"/>
+ </fileset>
+ <fileset dir="${trove.lib}">
+ <include name="trove.jar"/>
+ </fileset>
+ <fileset dir="${javassist.lib}">
+ <include name="javassist.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jnpserver.lib}">
+ <include name="jnpserver.jar"/>
+ </fileset>
+ <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>
+ <fileset dir="${slf4j.api.lib}">
+ <include name="slf4j-api-1.4.3.jar"/>
+ </fileset>
+ <fileset dir="${slf4j.log4j.lib}">
+ <include name="slf4j-log4j12.jar"/>
+ </fileset>
+ </copy>
- <copy todir="${build.distro.config.dir}">
- <fileset dir="${src.config.dir}">
- <include name="*.xml"/>
- <include name="jndi.properties"/>
- </fileset>
- <fileset dir="${test.dir}/config">
- <include name="messaging.keystore"/>
- <include name="messaging.truststore"/>
- </fileset>
- </copy>
- <copy todir="${build.distro.bin.dir}">
- <fileset dir="${src.bin.dir}">
- <include name="run.sh"/>
- <include name="run.bat"/>
- </fileset>
- </copy>
+ <copy todir="${build.distro.config.dir}">
+ <fileset dir="${src.config.dir}">
+ <include name="*.xml"/>
+ <include name="jndi.properties"/>
+ </fileset>
+ <fileset dir="${test.dir}/config">
+ <include name="messaging.keystore"/>
+ <include name="messaging.truststore"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.distro.bin.dir}">
+ <fileset dir="${src.bin.dir}">
+ <include name="run.sh"/>
+ <include name="run.bat"/>
+ </fileset>
+ </copy>
- <copy todir="${build.distro.bin.dir}">
- <fileset dir="${native.bin.dir}">
- <include name="*.so"/>
- </fileset>
- </copy>
+ <copy todir="${build.distro.bin.dir}">
+ <fileset dir="${native.bin.dir}">
+ <include name="*.so"/>
+ </fileset>
+ </copy>
- <antcall target="userdoc"/>
- <copy todir="${build.distro.dir}/docs/userguide">
- <fileset dir="${doc.build.dir}">
- <include name="**"/>
- </fileset>
- </copy>
- <antcall target="javadoc"/>
- <copy todir="${build.distro.api.dir}/">
- <fileset dir="${build.api.dir}">
- <include name="**"/>
- </fileset>
- </copy>
+ <antcall target="userdoc"/>
+ <copy todir="${build.distro.dir}/docs/userguide">
+ <fileset dir="${doc.build.dir}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ <antcall target="javadoc"/>
+ <copy todir="${build.distro.api.dir}/">
+ <fileset dir="${build.api.dir}">
+ <include name="**"/>
+ </fileset>
+ </copy>
- <copy todir="${build.distro.licenses.dir}/">
- <fileset dir="${licenses.dir}">
- <include name="**"/>
- </fileset>
- </copy>
+ <copy todir="${build.distro.licenses.dir}/">
+ <fileset dir="${licenses.dir}">
+ <include name="**"/>
+ </fileset>
+ </copy>
- <mkdir dir="${build.distro.examples.dir}"/>
- <copy todir="${build.distro.examples.dir}">
- <fileset dir="${doc.examples.dir}">
- <exclude name="build.properties"/>
- <exclude name="**/build/**"/>
- </fileset>
- </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"
- file="${build.distro.config.dir}/jndi.properties"/>
+ <mkdir dir="${build.distro.examples.dir}"/>
+ <copy todir="${build.distro.examples.dir}">
+ <fileset dir="${doc.examples.dir}">
+ <exclude name="build.properties"/>
+ <exclude name="**/build/**"/>
+ </fileset>
+ </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"
+ file="${build.distro.config.dir}/jndi.properties"/>
- <zip basedir="${build.dir}"
- destfile="${build.dir}/${build.artifact}.zip">
- <include name="${build.artifact}/**"/>
- <!-- add run.sh using a zipfileset to preserve its file permission -->
- <exclude name="${build.artifact}/bin/run.sh"/>
- <zipfileset dir="${build.dir}/${build.artifact}/bin"
- includes="run.sh" filemode="755" prefix="${build.artifact}/bin"/>
- </zip>
+ <zip basedir="${build.dir}"
+ destfile="${build.dir}/${build.artifact}.zip">
+ <include name="${build.artifact}/**"/>
+ <!-- add run.sh using a zipfileset to preserve its file permission -->
+ <exclude name="${build.artifact}/bin/run.sh"/>
+ <zipfileset dir="${build.dir}/${build.artifact}/bin"
+ includes="run.sh" filemode="755" prefix="${build.artifact}/bin"/>
+ </zip>
- <tar basedir="${build.dir}"
- destfile="${build.dir}/${build.artifact}.tar"
- longfile="gnu">
- <include name="${build.artifact}/**"/>
- <!-- add run.sh using a tarfileset to preserve its file permission -->
- <exclude name="${build.artifact}/bin/run.sh"/>
- <tarfileset dir="${build.dir}/${build.artifact}/bin"
- includes="run.sh" filemode="755" prefix="${build.artifact}/bin"/>
- </tar>
- <gzip src="${build.dir}/${build.artifact}.tar"
- destfile="${build.dir}/${build.artifact}.tar.gz"/>
- </target>
+ <tar basedir="${build.dir}"
+ destfile="${build.dir}/${build.artifact}.tar"
+ longfile="gnu">
+ <include name="${build.artifact}/**"/>
+ <!-- add run.sh using a tarfileset to preserve its file permission -->
+ <exclude name="${build.artifact}/bin/run.sh"/>
+ <tarfileset dir="${build.dir}/${build.artifact}/bin"
+ includes="run.sh" filemode="755" prefix="${build.artifact}/bin"/>
+ </tar>
+ <gzip src="${build.dir}/${build.artifact}.tar"
+ destfile="${build.dir}/${build.artifact}.tar.gz"/>
+ </target>
- <target name="userdoc">
- <ant dir="./docs/userguide" antfile="build.xml" target="all"/>
- </target>
+ <target name="userdoc">
+ <ant dir="./docs/userguide" antfile="build.xml" target="all"/>
+ </target>
- <target name="javadoc">
+ <target name="javadoc">
- <javadoc destdir="${build.api.dir}" author="true" version="true" use="true"
- windowtitle="JBoss Messaging ${module.version}">
+ <javadoc destdir="${build.api.dir}" author="true" version="true" use="true"
+ windowtitle="JBoss Messaging ${module.version}">
- <packageset dir="${src.main.dir}" defaultexcludes="yes">
- <include name="org/jboss/**"/>
- </packageset>
- <classpath refid="javadoc.classpath"/>
- <doctitle><![CDATA[<h2>JBoss Messaging ${module.version}</h2>]]></doctitle>
- <bottom><![CDATA[<i>Copyright © 2006 JBoss Inc. All Rights Reserved.</i>]]></bottom>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="JMS Facade" packages="org.jboss.jms.*"/>
- <group title="Messaging Core" packages="org.jboss.messaging.*"/>
- </javadoc>
- </target>
+ <packageset dir="${src.main.dir}" defaultexcludes="yes">
+ <include name="org/jboss/**"/>
+ </packageset>
+ <classpath refid="javadoc.classpath"/>
+ <doctitle><![CDATA[<h2>JBoss Messaging ${module.version}</h2>]]></doctitle>
+ <bottom><![CDATA[<i>Copyright © 2006 JBoss Inc. All Rights Reserved.</i>]]></bottom>
+ <tag name="todo" scope="all" description="To do:"/>
+ <group title="JMS Facade" packages="org.jboss.jms.*"/>
+ <group title="Messaging Core" packages="org.jboss.messaging.*"/>
+ </javadoc>
+ </target>
- <!-- test targets -->
+ <!-- test targets -->
- <target name="compile-unit-tests">
- <mkdir dir="${test.classes.dir}"/>
- <javac target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="${javac.include.ant.runtime}"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}"
- srcdir="${test.src.dir}"
- destdir="${test.classes.dir}">
- <classpath refid="test.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-unit-tests">
+ <mkdir dir="${test.classes.dir}"/>
+ <javac target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}"
+ srcdir="${test.src.dir}"
+ destdir="${test.classes.dir}">
+ <classpath refid="test.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="compile-jms-tests">
- <mkdir dir="${test.jms.classes.dir}"/>
- <javac target="${javac.target}"
- source="${javac.source}"
- optimize="${javac.optimize}"
- debug="${javac.debug}"
- depend="${javac.depend}"
- verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
- includeAntRuntime="true"
- includeJavaRuntime="${javac.include.java.runtime}"
- failonerror="${javac.fail.onerror}"
- srcdir="${test.jms.src.dir}"
- destdir="${test.jms.classes.dir}">
- <classpath refid="jms.test.compilation.classpath"/>
- </javac>
- </target>
+ <target name="compile-jms-tests">
+ <mkdir dir="${test.jms.classes.dir}"/>
+ <javac target="${javac.target}"
+ source="${javac.source}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="true"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}"
+ srcdir="${test.jms.src.dir}"
+ destdir="${test.jms.classes.dir}">
+ <classpath refid="jms.test.compilation.classpath"/>
+ </javac>
+ </target>
- <target name="performance-tests" depends="jar, compile-unit-tests">
- <antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/performance/**/*${test-mask}.class"/>
- </antcall>
- </target>
+ <target name="performance-tests" depends="jar, compile-unit-tests">
+ <antcall inheritall="true" inheritrefs="true" target="tests">
+ <param name="tests.param" value="**/org/jboss/messaging/tests/performance/**/*${test-mask}.class"/>
+ </antcall>
+ </target>
- <target name="integration-tests" depends="jar, compile-unit-tests">
- <antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/integration/**/*${test-mask}.class"/>
- </antcall>
- </target>
+ <target name="integration-tests" depends="jar, compile-unit-tests">
+ <antcall inheritall="true" inheritrefs="true" target="tests">
+ <param name="tests.param" value="**/org/jboss/messaging/tests/integration/**/*${test-mask}.class"/>
+ </antcall>
+ </target>
- <target name="concurrent-tests" depends="jar, compile-unit-tests">
- <antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/concurrent/**/*${test-mask}.class"/>
- </antcall>
- </target>
+ <target name="concurrent-tests" depends="jar, compile-unit-tests">
+ <antcall inheritall="true" inheritrefs="true" target="tests">
+ <param name="tests.param" value="**/org/jboss/messaging/tests/concurrent/**/*${test-mask}.class"/>
+ </antcall>
+ </target>
- <target name="unit-tests" depends="jar, compile-unit-tests">
- <antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/unit/**/*${test-mask}.class"/>
- <!-- if tests.validate.error is defined, it will fail the build in case of any test failure -->
- <param name="tests.validate.error" value="Defined!"/>
- </antcall>
- </target>
+ <target name="unit-tests" depends="jar, compile-unit-tests">
+ <antcall inheritall="true" inheritrefs="true" target="tests">
+ <param name="tests.param" value="**/org/jboss/messaging/tests/unit/**/*${test-mask}.class"/>
+ <!-- if tests.validate.error is defined, it will fail the build in case of any test failure -->
+ <param name="tests.validate.error" value="Defined!"/>
+ </antcall>
+ </target>
- <target name="timing-tests" depends="jar, compile-unit-tests">
- <antcall inheritall="true" inheritrefs="true" target="tests">
- <param name="tests.param" value="**/org/jboss/messaging/tests/timing/**/*${test-mask}.class"/>
- </antcall>
- </target>
+ <target name="timing-tests" depends="jar, compile-unit-tests">
+ <antcall inheritall="true" inheritrefs="true" target="tests">
+ <param name="tests.param" value="**/org/jboss/messaging/tests/timing/**/*${test-mask}.class"/>
+ </antcall>
+ </target>
- <target name="tests" depends="jar, compile-unit-tests">
- <echo message=""/>
- <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
- <echo message="classpath is:${toString:unit.test.execution.classpath}"/>
- <echo message=""/>
- <mkdir dir="${test.output.dir}"/>
- <mkdir dir="${test.reports.dir}"/>
- <junit printsummary="${junit.printsummary}"
- fork="on"
- forkMode="once"
- includeantruntime="${junit.includeantruntime}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- showoutput="${junit.showoutput}"
- timeout="${junit.timeout}">
- <sysproperty key="user.home" value="${user.home}"/>
- <jvmarg value="-Djava.library.path=native/bin"/>
- <jvmarg value="-Dmodule.output=./"/>
- <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin"/>
- <jvmarg value="-Xmx1024M"/>
- <!--
- <jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
- -->
- <!--<jvmarg value="-ea"/>-->
- <classpath refid="unit.test.execution.classpath"/>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- haltonerror="${junit.batchtest.haltonerror}"
- failureproperty="tests.failed">
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
- <fileset dir="${test.classes.dir}">
- <include name="${tests.param}"/>
- </fileset>
- </batchtest>
- </junit>
- <antcall target="tests-validate-error" inheritall="true" inheritrefs="true"/>
- </target>
+ <target name="tests" depends="jar, compile-unit-tests">
+ <echo message=""/>
+ <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message="classpath is:${toString:unit.test.execution.classpath}"/>
+ <echo message=""/>
+ <mkdir dir="${test.output.dir}"/>
+ <mkdir dir="${test.reports.dir}"/>
+ <junit printsummary="${junit.printsummary}"
+ fork="on"
+ forkMode="once"
+ includeantruntime="${junit.includeantruntime}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ showoutput="${junit.showoutput}"
+ timeout="${junit.timeout}">
+ <sysproperty key="user.home" value="${user.home}"/>
+ <jvmarg value="-Djava.library.path=native/bin"/>
+ <jvmarg value="-Dmodule.output=./"/>
+ <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg
+ value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
+ <jvmarg value="-Xmx1024M"/>
+ <!--
+ <jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+ -->
+ <!--<jvmarg value="-ea"/>-->
+ <classpath refid="unit.test.execution.classpath"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <batchtest todir="${junit.batchtest.todir}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ failureproperty="tests.failed">
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <fileset dir="${test.classes.dir}">
+ <include name="${tests.param}"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ <antcall target="tests-validate-error" inheritall="true" inheritrefs="true"/>
+ </target>
- <!-- ifs on ant are convoluted by definition... this will throw a BUILD FAILED if tests.validate.error was defined and if a error (tests.failed) happened -->
- <target name="tests-validate-error" if="tests.validate.error">
- <antcall target="tests-onerror" inheritall="true" inheritrefs="true"/>
- </target>
+ <!-- ifs on ant are convoluted by definition... this will throw a BUILD FAILED if tests.validate.error was defined and if a error (tests.failed) happened -->
+ <target name="tests-validate-error" if="tests.validate.error">
+ <antcall target="tests-onerror" inheritall="true" inheritrefs="true"/>
+ </target>
- <!-- ifs on ant are convoluted by definition... this will throw a BUILD FAILED if tests.validate.error was defined and if a error (tests.failed) happened -->
- <target name="tests-onerror" if="tests.failed">
- <antcall target="compile-reports"/>
- <fail message="Test suite failed!"/>
- </target>
+ <!-- ifs on ant are convoluted by definition... this will throw a BUILD FAILED if tests.validate.error was defined and if a error (tests.failed) happened -->
+ <target name="tests-onerror" if="tests.failed">
+ <antcall target="compile-reports"/>
+ <fail message="Test suite failed!"/>
+ </target>
- <target name="jms-tests" depends="jar, compile-jms-tests">
- <echo message=""/>
- <echo message="Running jms tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
- <echo message="classpath is:${toString:unit.test.execution.classpath}"/>
- <echo message=""/>
- <mkdir dir="${test.output.dir}"/>
- <mkdir dir="${test.reports.dir}"/>
- <junit printsummary="${junit.printsummary}"
- fork="on"
- forkMode="once"
- includeantruntime="${junit.includeantruntime}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- showoutput="${junit.showoutput}"
- timeout="${junit.timeout}">
+ <target name="jms-tests" depends="jar, compile-jms-tests">
+ <echo message=""/>
+ <echo message="Running jms tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message="classpath is:${toString:unit.test.execution.classpath}"/>
+ <echo message=""/>
+ <mkdir dir="${test.output.dir}"/>
+ <mkdir dir="${test.reports.dir}"/>
+ <junit printsummary="${junit.printsummary}"
+ fork="on"
+ forkMode="once"
+ includeantruntime="${junit.includeantruntime}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ showoutput="${junit.showoutput}"
+ timeout="${junit.timeout}">
- <jvmarg value="-Xmx1024M"/>
- <jvmarg value="-Djava.library.path=native/bin"/>
- <jvmarg value="-Dmodule.output=./"/>
- <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
- <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
- <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
- <!--<jvmarg value="-ea"/>-->
- <sysproperty key="jbm.remoting.disable.invm" value="${disable.invm}"/>
- <classpath refid="jms.test.execution.classpath"/>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- haltonerror="${junit.batchtest.haltonerror}">
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
- <fileset dir="${test.jms.classes.dir}">
- <include name="**/messaging/**/${test-mask}.class"/>
- <include name="**/jms/**/${test-mask}.class"/>
- <include name="**/messaging/util/**/${test-mask}.class"/>
- <exclude name="**/jms/ExpiryQueueTest.class"/>
- <exclude name="**/jms/DLQTest.class"/>
- <exclude name="**/jms/JCAWrapperTest.class"/>
- <exclude name="**/jms/XARecoveryTest.class"/>
- <exclude name="**/jms/XAResourceRecoveryTest.class"/>
- <exclude name="**/jms/XATest.class"/>
- <exclude name="**/jms/MemLeakTest.class"/>
- <exclude name="**/jms/stress/**"/>
- <exclude name="**/jms/bridge/**"/>
- <exclude name="**/jms/manual/**"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
+ <jvmarg value="-Xmx1024M"/>
+ <jvmarg value="-Djava.library.path=native/bin"/>
+ <jvmarg value="-Dmodule.output=./"/>
+ <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg
+ value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
+ <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
+ <!--<jvmarg value="-ea"/>-->
+ <sysproperty key="jbm.remoting.disable.invm" value="${disable.invm}"/>
+ <classpath refid="jms.test.execution.classpath"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <batchtest todir="${junit.batchtest.todir}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ haltonerror="${junit.batchtest.haltonerror}">
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <fileset dir="${test.jms.classes.dir}">
+ <include name="**/messaging/**/${test-mask}.class"/>
+ <include name="**/jms/**/${test-mask}.class"/>
+ <include name="**/messaging/util/**/${test-mask}.class"/>
+ <exclude name="**/jms/ExpiryQueueTest.class"/>
+ <exclude name="**/jms/DLQTest.class"/>
+ <exclude name="**/jms/JCAWrapperTest.class"/>
+ <exclude name="**/jms/XARecoveryTest.class"/>
+ <exclude name="**/jms/XAResourceRecoveryTest.class"/>
+ <exclude name="**/jms/XATest.class"/>
+ <exclude name="**/jms/MemLeakTest.class"/>
+ <exclude name="**/jms/stress/**"/>
+ <exclude name="**/jms/bridge/**"/>
+ <exclude name="**/jms/manual/**"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
- <target name="stress-tests" depends="jar, compile-unit-tests">
- <echo message=""/>
- <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
- <echo message=""/>
- <mkdir dir="${test.output.dir}"/>
- <mkdir dir="${test.reports.dir}"/>
- <junit printsummary="${junit.printsummary}"
- fork="on"
- forkMode="once"
- includeantruntime="${junit.includeantruntime}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- showoutput="${junit.showoutput}"
- timeout="${junit.timeout}">
+ <target name="stress-tests" depends="jar, compile-unit-tests">
+ <echo message=""/>
+ <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message=""/>
+ <mkdir dir="${test.output.dir}"/>
+ <mkdir dir="${test.reports.dir}"/>
+ <junit printsummary="${junit.printsummary}"
+ fork="on"
+ forkMode="once"
+ includeantruntime="${junit.includeantruntime}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ showoutput="${junit.showoutput}"
+ timeout="${junit.timeout}">
- <jvmarg value="-Xmx1024M"/>
- <jvmarg value="-Djava.library.path=native/bin"/>
- <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
- <!--<jvmarg value="-ea"/>-->
- <classpath refid="unit.test.execution.classpath"/>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- haltonerror="${junit.batchtest.haltonerror}">
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
- <fileset dir="${test.classes.dir}">
- <include name="**/org/jboss/messaging/tests/stress/**/*${test-mask}.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
+ <jvmarg value="-Xmx1024M"/>
+ <jvmarg value="-Djava.library.path=native/bin"/>
+ <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
+ <!--<jvmarg value="-ea"/>-->
+ <classpath refid="unit.test.execution.classpath"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <batchtest todir="${junit.batchtest.todir}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ haltonerror="${junit.batchtest.haltonerror}">
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <fileset dir="${test.classes.dir}">
+ <include name="**/org/jboss/messaging/tests/stress/**/*${test-mask}.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
- <target name="all-tests" depends="unit-tests, integration-tests, concurrent-tests, stress-tests, jms-tests"/>
+ <target name="all-tests" depends="unit-tests, integration-tests, concurrent-tests, stress-tests, jms-tests"/>
- <target name="hudson-tests" depends="unit-tests, integration-tests, concurrent-tests, jms-tests"/>
+ <target name="hudson-tests" depends="unit-tests, integration-tests, concurrent-tests, jms-tests"/>
- <target name="compile-reports">
- <mkdir dir="${test.stylesheets.dir}"/>
- <copy todir="${test.stylesheets.dir}" filtering="yes">
- <fileset dir="${test.src.stylesheets.dir}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <mkdir dir="${test.reports.dir}/html"/>
- <junitreport todir="${test.reports.dir}">
- <fileset dir="${test.reports.dir}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames"
- todir="${test.reports.dir}/html"
- styledir="${test.stylesheets.dir}"/>
- </junitreport>
- </target>
+ <target name="compile-reports">
+ <mkdir dir="${test.stylesheets.dir}"/>
+ <copy todir="${test.stylesheets.dir}" filtering="yes">
+ <fileset dir="${test.src.stylesheets.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${test.reports.dir}/html"/>
+ <junitreport todir="${test.reports.dir}">
+ <fileset dir="${test.reports.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames"
+ todir="${test.reports.dir}/html"
+ styledir="${test.stylesheets.dir}"/>
+ </junitreport>
+ </target>
- <property name="test.execution.classpath.file" value=".test.execution.classpath"/>
+ <property name="test.execution.classpath.file" value=".test.execution.classpath"/>
- <target name="get-unit-test-execution-classpath" depends="init">
- <pathconvert refid="unit.test.execution.classpath"
- property="test.execution.classpath.unix"/>
- <echo message="${test.execution.classpath.unix}" file="${test.execution.classpath.file}"/>
- </target>
+ <target name="get-unit-test-execution-classpath" depends="init">
+ <pathconvert refid="unit.test.execution.classpath"
+ property="test.execution.classpath.unix"/>
+ <echo message="${test.execution.classpath.unix}" file="${test.execution.classpath.file}"/>
+ </target>
- <target name="get-jms-test-execution-classpath" depends="init">
- <pathconvert refid="jms.test.execution.classpath"
- property="test.execution.classpath.unix"/>
- <echo message="${test.execution.classpath.unix}" file="${test.execution.classpath.file}"/>
- </target>
+ <target name="get-jms-test-execution-classpath" depends="init">
+ <pathconvert refid="jms.test.execution.classpath"
+ property="test.execution.classpath.unix"/>
+ <echo message="${test.execution.classpath.unix}" file="${test.execution.classpath.file}"/>
+ </target>
- <target name="emma" depends="jar, compile-unit-tests">
- <property name="emma.dir" location="${build.dir}/emma"/>
+ <target name="emma" depends="jar, compile-unit-tests">
+ <property name="emma.dir" location="${build.dir}/emma"/>
- <path id="emma.lib">
- <pathelement location="${test.dir}/lib/emma.jar"/>
- <pathelement location="${test.dir}/lib/emma_ant.jar"/>
- </path>
+ <path id="emma.lib">
+ <pathelement location="${test.dir}/lib/emma.jar"/>
+ <pathelement location="${test.dir}/lib/emma_ant.jar"/>
+ </path>
- <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
- <!-- Instrument the .class files. -->
- <mkdir dir="${build.dir}/emmaclasses"/>
- <emma enabled="true">
- <instr instrpath="${build.dir}/classes"
- destdir="${build.dir}/classes"
- metadatafile="${emma.dir}/metadata.emma"
- merge="true" mode="overwrite">
- </instr>
- </emma>
+ <taskdef resource="emma_ant.properties" classpathref="emma.lib"/>
+ <!-- Instrument the .class files. -->
+ <mkdir dir="${build.dir}/emmaclasses"/>
+ <emma enabled="true">
+ <instr instrpath="${build.dir}/classes"
+ destdir="${build.dir}/classes"
+ metadatafile="${emma.dir}/metadata.emma"
+ merge="true" mode="overwrite">
+ </instr>
+ </emma>
- <path id="emma.execution.classpath">
- <path refid="emma.lib"/>
- <path refid="unit.test.execution.classpath"/>
- </path>
+ <path id="emma.execution.classpath">
+ <path refid="emma.lib"/>
+ <path refid="unit.test.execution.classpath"/>
+ </path>
- <echo message=""/>
- <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
- <echo message=""/>
- <mkdir dir="${test.output.dir}"/>
- <mkdir dir="${test.reports.dir}"/>
- <junit printsummary="${junit.printsummary}"
- fork="on"
- forkMode="once"
- includeantruntime="${junit.includeantruntime}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- showoutput="${junit.showoutput}"
- timeout="${junit.timeout}">
- <sysproperty key="user.home" value="${user.home}"/>
- <sysproperty key="emma.coverage.out.file" value="${emma.dir}/coverage.emma"/>
- <sysproperty key="emma.coverage.out.merge" value="true"/>
- <jvmarg value="-Djava.library.path=native/bin"/>
- <jvmarg value="-Xmx1024M"/>
- <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
- <!--<jvmarg value="-ea"/>-->
- <classpath refid="emma.execution.classpath"/>
- <formatter type="xml" usefile="${junit.formatter.usefile}"/>
- <batchtest todir="${junit.batchtest.todir}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- haltonerror="${junit.batchtest.haltonerror}">
- <formatter type="plain" usefile="${junit.formatter.usefile}"/>
- <fileset dir="${test.classes.dir}">
- <include name="${test-mask}"/>
- <include name="**/org/jboss/messaging/tests/integration/**/${test-mask}.class"/>
- <include name="**/org/jboss/messaging/tests/unit/**/${test-mask}.class"/>
- <exclude name="**/org/jboss/messaging/tests/local/**/${test-mask}.class"/>
- <exclude name="**/org/jboss/messaging/tests/performance/**/${test-mask}.class"/>
- </fileset>
- </batchtest>
- </junit>
+ <echo message=""/>
+ <echo message="Running unit tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message=""/>
+ <mkdir dir="${test.output.dir}"/>
+ <mkdir dir="${test.reports.dir}"/>
+ <junit printsummary="${junit.printsummary}"
+ fork="on"
+ forkMode="once"
+ includeantruntime="${junit.includeantruntime}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ showoutput="${junit.showoutput}"
+ timeout="${junit.timeout}">
+ <sysproperty key="user.home" value="${user.home}"/>
+ <sysproperty key="emma.coverage.out.file" value="${emma.dir}/coverage.emma"/>
+ <sysproperty key="emma.coverage.out.merge" value="true"/>
+ <jvmarg value="-Djava.library.path=native/bin"/>
+ <jvmarg value="-Xmx1024M"/>
+ <!--<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>-->
+ <!--<jvmarg value="-ea"/>-->
+ <classpath refid="emma.execution.classpath"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+ <batchtest todir="${junit.batchtest.todir}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ haltonerror="${junit.batchtest.haltonerror}">
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <fileset dir="${test.classes.dir}">
+ <include name="${test-mask}"/>
+ <include name="**/org/jboss/messaging/tests/integration/**/${test-mask}.class"/>
+ <include name="**/org/jboss/messaging/tests/unit/**/${test-mask}.class"/>
+ <exclude name="**/org/jboss/messaging/tests/local/**/${test-mask}.class"/>
+ <exclude name="**/org/jboss/messaging/tests/performance/**/${test-mask}.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
- <!-- Generate Emma reports. -->
- <emma enabled="true">
- <report sourcepath="${src.main.dir}"
- sort="+name"
- metrics="method:70,block:80,line:80,class:100">
- <fileset dir="${emma.dir}">
- <include name="*.emma"/>
- </fileset>
- <xml outfile="${test.reports.dir}/emma/coverage.xml" depth="method"/>
- <html outfile="${test.reports.dir}/emma/coverage.html"
- depth="method" columns="name,class,method,block,line"/>
- </report>
- </emma>
+ <!-- Generate Emma reports. -->
+ <emma enabled="true">
+ <report sourcepath="${src.main.dir}"
+ sort="+name"
+ metrics="method:70,block:80,line:80,class:100">
+ <fileset dir="${emma.dir}">
+ <include name="*.emma"/>
+ </fileset>
+ <xml outfile="${test.reports.dir}/emma/coverage.xml" depth="method"/>
+ <html outfile="${test.reports.dir}/emma/coverage.html"
+ depth="method" columns="name,class,method,block,line"/>
+ </report>
+ </emma>
- </target>
- <!--server-->
+ </target>
+ <!--server-->
- <target name="runServer" depends="jar">
- <java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
- <jvmarg value="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
- <jvmarg value="-XX:+UseParallelGC"/>
- <jvmarg value="-Xms512M"/>
- <jvmarg value="-Xmx2048M"/>
- <jvmarg value="-XX:+AggressiveOpts"/>
- <jvmarg value="-XX:+UseFastAccessorMethods"/>
- <jvmarg value="-Dcom.sun.management.jmxremote"/>
- <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
- <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
- <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
- <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
- <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
- <arg line="jbm-standalone-beans.xml"/>
- <classpath refid="jms.standalone.server.classpath"/>
- </java>
- </target>
+ <target name="runServer" depends="jar">
+ <java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
+ <jvmarg value="-XX:+UseParallelGC"/>
+ <jvmarg value="-Xms512M"/>
+ <jvmarg value="-Xmx2048M"/>
+ <jvmarg value="-XX:+AggressiveOpts"/>
+ <jvmarg value="-XX:+UseFastAccessorMethods"/>
+ <jvmarg value="-Dcom.sun.management.jmxremote"/>
+ <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg
+ value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
+ <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
+ <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
+ <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
+ <arg line="jbm-standalone-beans.xml"/>
+ <classpath refid="jms.standalone.server.classpath"/>
+ </java>
+ </target>
- <target name="debugServer" depends="jar">
- <java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
- <jvmarg value="-XX:+UseParallelGC"/>
- <jvmarg value="-Xms512M"/>
- <jvmarg value="-Xmx2048M"/>
- <jvmarg value="-XX:+AggressiveOpts"/>
- <jvmarg value="-XX:+UseFastAccessorMethods"/>
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=NONE"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
- <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.core.logging.JBMLoggerPlugin"/>
- <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
- <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
- <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
- <arg line="jbm-standalone-beans.xml"/>
- <classpath refid="jms.test.execution.classpath"/>
- </java>
- </target>
+ <target name="debugServer" depends="jar">
+ <java classname="org.jboss.messaging.integration.bootstrap.JBMBootstrapServer" fork="true">
+ <jvmarg value="-XX:+UseParallelGC"/>
+ <jvmarg value="-Xms512M"/>
+ <jvmarg value="-Xmx2048M"/>
+ <jvmarg value="-XX:+AggressiveOpts"/>
+ <jvmarg value="-XX:+UseFastAccessorMethods"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
+ <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>
+ <jvmarg
+ value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
+ <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
+ <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
+ <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
+ <arg line="jbm-standalone-beans.xml"/>
+ <classpath refid="jms.test.execution.classpath"/>
+ </java>
+ </target>
- <target name="findbugs" depends="jar">
- <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
- <findbugs home="${findbugs.home}"
- output="html"
- outputFile="bugs.html">
- <auxClasspath refid="findbugs.classpath"/>
- <sourcePath path="${src.main.dir}"/>
- <class location="${build.jars.dir}/jboss-${module.name}.jar"/>
- </findbugs>
+ <target name="findbugs" depends="jar">
+ <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
+ <findbugs home="${findbugs.home}"
+ output="html"
+ outputFile="bugs.html">
+ <auxClasspath refid="findbugs.classpath"/>
+ <sourcePath path="${src.main.dir}"/>
+ <class location="${build.jars.dir}/jboss-${module.name}.jar"/>
+ </findbugs>
- </target>
- <!-- Examples -->
+ </target>
+ <!-- Examples -->
- <target name="queueExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="queueExample"/>
- </target>
+ <target name="queueExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="queueExample"/>
+ </target>
- <target name="topicExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="topicExample"/>
- </target>
+ <target name="topicExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="topicExample"/>
+ </target>
- <target name="durSubExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="durSubExample"/>
- </target>
+ <target name="durSubExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="durSubExample"/>
+ </target>
- <target name="wildcardExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="wildcardExample"/>
- </target>
+ <target name="wildcardExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="wildcardExample"/>
+ </target>
- <target name="messageGroupingExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="messageGroupingExample"/>
- </target>
+ <target name="messageGroupingExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="messageGroupingExample"/>
+ </target>
- <target name="scheduledExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="scheduledExample"/>
- </target>
+ <target name="scheduledExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="scheduledExample"/>
+ </target>
- <target name="simpleClient" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleClient"/>
- </target>
+ <target name="simpleClient" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleClient"/>
+ </target>
- <target name="ssslClient" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="sslClient"/>
- </target>
+ <target name="ssslClient" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="sslClient"/>
+ </target>
- <target name="simpleExample" depends="jar">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleExample"/>
- </target>
+ <target name="simpleExample" depends="jar">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="simpleExample"/>
+ </target>
- <target name="managementClient" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="managementClient"/>
- </target>
+ <target name="managementClient" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="managementClient"/>
+ </target>
- <target name="wildCardClient" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="wildCardClient"/>
- </target>
+ <target name="wildCardClient" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="wildCardClient"/>
+ </target>
- <target name="scheduledMessageExample" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/messaging" antfile="build.xml" target="scheduledMessageExample"/>
- </target>
- <!-- Performance examples -->
+ <target name="scheduledMessageExample" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/messaging" antfile="build.xml" target="scheduledMessageExample"/>
+ </target>
+ <!-- Performance examples -->
- <target name="perfListener" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfListener"/>
- </target>
+ <target name="perfListener" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfListener"/>
+ </target>
- <target name="perfAutoAckListener" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfAutoAckListener"/>
- </target>
+ <target name="perfAutoAckListener" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfAutoAckListener"/>
+ </target>
- <target name="perfDupsOKListener" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfDupsOKListener"/>
- </target>
+ <target name="perfDupsOKListener" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfDupsOKListener"/>
+ </target>
- <target name="perfTransactionalListener" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalListener"/>
- </target>
+ <target name="perfTransactionalListener" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalListener"/>
+ </target>
- <target name="perfSender" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfSender"/>
- </target>
+ <target name="perfSender" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfSender"/>
+ </target>
- <target name="perfNonTransactionalSender" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfNonTransactionalSender"/>
- </target>
+ <target name="perfNonTransactionalSender" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfNonTransactionalSender"/>
+ </target>
- <target name="perfTransactionalSender" depends="jar-client, jar-transports, jar-jms">
- <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalSender"/>
- </target>
+ <target name="perfTransactionalSender" depends="jar-client, jar-transports, jar-jms">
+ <ant dir="${examples.dir}/jms" antfile="build.xml" target="perfTransactionalSender"/>
+ </target>
</project>
Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml 2008-11-13 08:21:44 UTC (rev 5346)
+++ trunk/build-thirdparty.xml 2008-11-13 10:43:39 UTC (rev 5347)
@@ -33,133 +33,133 @@
<project name="main.build" default="synchronize">
- <!-- ======================================================================================== -->
- <!-- Configuration -->
- <!-- ======================================================================================== -->
+ <!-- ======================================================================================== -->
+ <!-- Configuration -->
+ <!-- ======================================================================================== -->
- <property file="local.properties"/>
- <property file="synchronize.properties"/>
- <property name="librariesEntFile" value="./thirdparty/libraries.ent"/>
+ <property file="local.properties"/>
+ <property file="synchronize.properties"/>
+ <property name="librariesEntFile" value="./thirdparty/libraries.ent"/>
- <property environment="ENV"/>
+ <property environment="ENV"/>
- <!--
- | Allow jbossbuild.repository to be set from (in order or priority)
- | 1) Command line -Djbossbuild.repository=...
- | 2) synchronize.properties jbossbuild.repository setting
- | 3) JBOSS_REPOSITORY environment variable
- -->
- <condition property="jbossbuild.repository" value="${ENV.JBOSS_REPOSITORY}">
- <isset property="ENV.JBOSS_REPOSITORY"/>
- </condition>
+ <!--
+ | Allow jbossbuild.repository to be set from (in order or priority)
+ | 1) Command line -Djbossbuild.repository=...
+ | 2) synchronize.properties jbossbuild.repository setting
+ | 3) JBOSS_REPOSITORY environment variable
+ -->
+ <condition property="jbossbuild.repository" value="${ENV.JBOSS_REPOSITORY}">
+ <isset property="ENV.JBOSS_REPOSITORY"/>
+ </condition>
- <!--
- | Fall back to default.
- -->
- <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
+ <!--
+ | Fall back to default.
+ -->
+ <property name="jbossbuild.repository" value="http://repository.jboss.com"/>
- <import file="./tools/config/jbossbuild/tasks.xml"/>
+ <import file="./tools/config/jbossbuild/tasks.xml"/>
- <!--
- | This is where JBoss Messaging external dependencies are declared. The repository is in CVS
- | under the module repository.jboss.com whose contents are pushed to the
- | http://repository.jboss.com site.
- -->
- <build id="jboss-messaging"
- impltitle="JBoss Messaging"
- implversion="undefined"
- implvendor="JBoss Inc."
- implurl="http://www.jboss.org"
- description="JBoss Messaging"
- cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
- thirdpartypath="./thirdparty/"
- location="${jbossbuild.repository}"
- targetdefs="targets">
+ <!--
+ | This is where JBoss Messaging external dependencies are declared. The repository is in CVS
+ | under the module repository.jboss.com whose contents are pushed to the
+ | http://repository.jboss.com site.
+ -->
+ <build id="jboss-messaging"
+ impltitle="JBoss Messaging"
+ implversion="undefined"
+ implvendor="JBoss Inc."
+ implurl="http://www.jboss.org"
+ description="JBoss Messaging"
+ cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
+ thirdpartypath="./thirdparty/"
+ location="${jbossbuild.repository}"
+ targetdefs="targets">
- <!--
- needed for the filters
- -->
- <componentref name="sun-javacc" version="3.2"/>
+ <!--
+ needed for the filters
+ -->
+ <componentref name="sun-javacc" version="3.2"/>
- <!--
- Dependencies required to build the transport jar
- -->
+ <!--
+ Dependencies required to build the transport jar
+ -->
- <componentref name="netty" version="3.0.1.GA"/>
- <componentref name="apache-mina" version="2.0.0-M3-20080730.120633-1"/>
+ <componentref name="netty" version="3.0.1.GA"/>
+ <componentref name="apache-mina" version="2.0.0-M3-20080730.120633-1"/>
- <!--
- Dependencies needed to build the security.jar
- -->
+ <!--
+ Dependencies needed to build the security.jar
+ -->
- <componentref name="jboss/integration" version="5.0.0.Beta4"/>
- <componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
- <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
- <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
+ <componentref name="jboss/integration" version="5.0.0.Beta4"/>
+ <componentref name="jboss/jboss-security-spi" version="2.0.1.GA"/>
+ <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
+ <componentref name="jboss/jboss-jaspi-api" version="1.0-BETA1"/>
- <!--
- Dependencies required to build the bootstrap.jar
- -->
+ <!--
+ Dependencies required to build the bootstrap.jar
+ -->
- <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
- <componentref name="jboss/common" version="1.2.1.GA"/>
+ <componentref name="jboss/microcontainer" version="2.0.0.Beta5"/>
+ <componentref name="jboss/common" version="1.2.1.GA"/>
- <!--
- Dependencies required to build logging.jar
- -->
+ <!--
+ Dependencies required to build logging.jar
+ -->
- <componentref name="apache-log4j" version="1.2.14-brew"/>
- <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
+ <componentref name="apache-log4j" version="1.2.14-brew"/>
+ <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
- <!--
- Dependencies required to build jms.jar
- -->
+ <!--
+ Dependencies required to build jms.jar
+ -->
- <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
- <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
- <!--already defined <componentref name="jboss/integration" version="5.0.0.Beta4"/>-->
+ <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
+ <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
+ <!--already defined <componentref name="jboss/integration" version="5.0.0.Beta4"/>-->
- <!--
- Dependencies required to run the unit tests
- -->
+ <!--
+ Dependencies required to run the unit tests
+ -->
- <componentref name="junit" version="3.8.2-brew"/>
- <componentref name="easymock" version="2.3"/>
- <!-- the extension is used to mock some concrete classes -->
- <componentref name="easymock-classextension" version="2.3"/>
- <componentref name="trove" version="1.0.2-brew"/>
- <componentref name="jboss/common-core" version="2.2.2.GA"/>
- <componentref name="jboss/aop" version="2.0.0.beta2"/>
- <componentref name="javassist" version="3.6.0.GA/"/>
- <componentref name="jboss/jbossxb" version="2.0.0.CR4"/>
- <componentref name="apache-xerces" version="2.7.1-brew"/>
- <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
- <componentref name="slf4j/log4j" version="1.4.3"/>
-
- <!--
- Dependencies required to run the jms tests
- -->
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="easymock" version="2.3"/>
+ <!-- the extension is used to mock some concrete classes -->
+ <componentref name="easymock-classextension" version="2.3"/>
+ <componentref name="trove" version="1.0.2-brew"/>
+ <componentref name="jboss/common-core" version="2.2.2.GA"/>
+ <componentref name="jboss/aop" version="2.0.0.beta2"/>
+ <componentref name="javassist" version="3.6.0.GA/"/>
+ <componentref name="jboss/jbossxb" version="2.0.0.CR4"/>
+ <componentref name="apache-xerces" version="2.7.1-brew"/>
+ <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
+ <componentref name="slf4j/log4j" version="1.4.3"/>
- <componentref name="apache-logging" version="1.1.0.jboss"/>
-
- <!--
- Dependencies required to run the server standalone.
- -->
+ <!--
+ Dependencies required to run the jms tests
+ -->
- <componentref name="jboss/jnpserver" version="5.0.0.Beta3"/>
- </build>
+ <componentref name="apache-logging" version="1.1.0.jboss"/>
- <synchronizeinfo/>
+ <!--
+ Dependencies required to run the server standalone.
+ -->
- <!--
- | Generate the targets.
- -->
- <generate generate="jboss-messaging"/>
+ <componentref name="jboss/jnpserver" version="5.0.0.Beta3"/>
+ </build>
- <target name="generate-libraries-ent" depends="synchronize">
- <gen-lib-file path="tools/config/buildmagic" filename="${librariesEntFile}"/>
- <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
- </target>
+ <synchronizeinfo/>
+ <!--
+ | Generate the targets.
+ -->
+ <generate generate="jboss-messaging"/>
+
+ <target name="generate-libraries-ent" depends="synchronize">
+ <gen-lib-file path="tools/config/buildmagic" filename="${librariesEntFile}"/>
+ <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
+ </target>
+
</project>
More information about the jboss-cvs-commits
mailing list