[hornetq-commits] JBoss hornetq SVN: r9168 - trunk.

Author: ataylor Date: 2010-04-26 10:23:46 -0400 (Mon, 26 Apr 2010) New Revision: 9168 Modified: trunk/build-hornetq.xml Log: updated build file Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-04-26 14:18:05 UTC (rev 9167) +++ trunk/build-hornetq.xml 2010-04-26 14:23:46 UTC (rev 9168) @@ -89,7 +89,7 @@ <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.ra.classes.dir" value="${build.dir}/classes/ra"/> - <property name="build.jars.dir" value="${build.dir}/jars"/> + <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"/> @@ -98,8 +98,10 @@ <property name="src.config.standalone.clustered.dir" value="${src.dir}/config/stand-alone/clustered"/> <property name="src.config.trunk.non-clustered.dir" value="${src.dir}/config/trunk/non-clustered"/> <property name="src.config.trunk.clustered.dir" value="${src.dir}/config/trunk/clustered"/> - <property name="src.config.jbossas.non-clustered.dir" value="${src.dir}/config/jboss-as/non-clustered"/> - <property name="src.config.jbossas.clustered.dir" value="${src.dir}/config/jboss-as/clustered"/> + <property name="src.config.jbossas4.non-clustered.dir" value="${src.dir}/config/jboss-as-4/non-clustered"/> + <property name="src.config.jbossas4.clustered.dir" value="${src.dir}/config/jboss-as-4/clustered"/> + <property name="src.config.jbossas5.non-clustered.dir" value="${src.dir}/config/jboss-as-5/non-clustered"/> + <property name="src.config.jbossas5.clustered.dir" value="${src.dir}/config/jboss-as-5/clustered"/> <property name="src.config.service.dir" value="${src.dir}/config/service"/> <property name="src.schema.dir" value="${src.config.dir}/common/schema"/> <property name="src.bin.dir" value="${src.dir}/bin"/> @@ -129,12 +131,12 @@ <property name="build.distro.tools.dir" value="${build.distro.dir}/tools"/> <property name="artifacts.dir" value="${build.dir}/artifacts"/> - <!--default clustering server settings--> + <!--default clustering server settings--> <property name="hornetq.remoting.netty.port" value="5445"/> <property name="jnp.port" value="1099"/> <property name="jnp.rmiPort" value="1098"/> <property name="hornetq.data.dir" value="data1"/> - + <!-- ======================================================================================== --> <!-- Thirdparty Dependency --> <!-- ======================================================================================== --> @@ -152,7 +154,7 @@ Setting "nodownload" to true inhibits downloading of up-to-date dependencies. --> <property name="nodownload" value="false"/> - + <!-- ======================================================================================== --> <!-- Test properties --> <!-- ======================================================================================== --> @@ -184,7 +186,7 @@ <path id="core.compilation.classpath"> <path refid="org.jboss.netty.classpath"/> </path> - + <path id="jms.compilation.classpath"> <path location="${build.core.classes.dir}"/> <path refid="org.jboss.netty.classpath"/> @@ -200,7 +202,7 @@ <path refid="org.jboss.integration.classpath"/> <path refid="org.jboss.javaee.classpath"/> </path> - + <path id="jboss.service.compilation.classpath"> <path refid="org.jboss.javaee.classpath"/> <path location="${build.core.classes.dir}"/> @@ -256,7 +258,7 @@ <path refid="org.jboss.naming.classpath"/> <path refid="org.jboss.logging.classpath"/> </path> - + <path id="findbugs.classpath"> <path refid="jms.compilation.classpath"/> <path location="${build.jars.dir}/jboss-${module.name}.jar"/> @@ -297,7 +299,7 @@ <path refid="test.compilation.classpath"/> <path refid="apache.xerces.classpath"/> </path> - + <path id="jms.test.execution.classpath"> <pathelement location="${src.schema.dir}"/> <pathelement location="${test.jms.dir}/config"/> @@ -316,7 +318,7 @@ <pathelement location="${test.dir}/config"/> <pathelement location="${src.config.dir}/common"/> </path> - + <path id="joram.test.execution.classpath"> <pathelement location="${test.joram.classes.dir}"/> <pathelement location="${test.joram.config.dir}"/> @@ -347,7 +349,7 @@ <delete dir="${test.output.dir}" quiet="true"/> <delete dir="${test.jms.build.dir}" quiet="true"/> <delete dir="${test.joram.build.dir}" quiet="true"/> - <delete dir="${thirdparty.dir}" quiet="true"/> + <delete dir="${thirdparty.dir}" quiet="true"/> <delete quiet="true"> <fileset dir="${logs.dir}" includes="*"/> </delete> @@ -367,8 +369,8 @@ <mkdir dir="${build.jars.dir}"/> <mkdir dir="${build.src.dir}"/> </target> - - + + <target name="createthirdparty" unless="inhibit.downloads" depends="check.inhibit.downloads"> <ant antfile="build-thirdparty.xml" target="maven-install"/> </target> @@ -387,7 +389,7 @@ <!-- ================================= --> <!-- Compilation targets --> <!-- ================================= --> - + <target name="compile" depends="compile-jms"/> <target name="compile-core" depends="init"> @@ -473,7 +475,7 @@ <classpath refid="jboss.integration.compilation.classpath"/> </javac> </target> - + <!-- author: Lucas Amador --> <target name="compile-jboss-service" depends="compile-core"> <javac destdir="${build.service.classes.dir}" @@ -493,8 +495,6 @@ <include name="org/hornetq/service/**/*.java"/> <classpath refid="jboss.service.compilation.classpath"/> </javac> - <copy file="${src.config.service.dir}/jboss-service.xml" - tofile="${build.service.classes.dir}/META-INF/jboss-service.xml" overwrite="true" /> </target> <target name="compile-bootstrap" depends="compile-core"> @@ -563,14 +563,14 @@ <arg line="bootstrap"/> </exec> </target> - + <target name="validate-configuration"> <antcall target="-validate-configuration"> <param name="conf.dir" value="${src.config.standalone.non-clustered.dir}"/> </antcall> <!-- user configuration is only for standalone --> <schemavalidate file="${src.config.standalone.non-clustered.dir}/hornetq-users.xml"> - <schema namespace="urn:hornetq" + <schema namespace="urn:hornetq" file="${src.schema.dir}/hornetq-users.xsd"/> </schemavalidate> @@ -579,31 +579,38 @@ </antcall> <!-- user configuration is only for standalone --> <schemavalidate file="${src.config.standalone.clustered.dir}/hornetq-users.xml"> - <schema namespace="urn:hornetq" + <schema namespace="urn:hornetq" file="${src.schema.dir}/hornetq-users.xsd"/> </schemavalidate> - - <!-- AS 5 configuration validation --> + + <!-- AS 4 configuration validation --> <antcall target="-validate-configuration"> - <param name="conf.dir" value="${src.config.jbossas.non-clustered.dir}"/> + <param name="conf.dir" value="${src.config.jbossas4.non-clustered.dir}"/> </antcall> <antcall target="-validate-configuration"> - <param name="conf.dir" value="${src.config.jbossas.clustered.dir}"/> + <param name="conf.dir" value="${src.config.jbossas4.clustered.dir}"/> </antcall> + <!-- AS 5 configuration validation --> + <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.jbossas5.non-clustered.dir}"/> + </antcall> + <antcall target="-validate-configuration"> + <param name="conf.dir" value="${src.config.jbossas5.clustered.dir}"/> + </antcall> </target> - + <target name="-validate-configuration"> <echo>validating configuration from ${conf.dir}</echo> <schemavalidate file="${conf.dir}/hornetq-configuration.xml"> - <schema namespace="urn:hornetq" + <schema namespace="urn:hornetq" file="${src.schema.dir}/hornetq-configuration.xsd"/> </schemavalidate> <schemavalidate file="${conf.dir}/hornetq-jms.xml"> - <schema namespace="urn:hornetq" + <schema namespace="urn:hornetq" file="${src.schema.dir}/hornetq-jms.xsd"/> </schemavalidate> </target> - + <!-- ======================================================================================== --> <!-- Jar Targets --> <!-- ======================================================================================== --> @@ -615,7 +622,7 @@ <target name="jar" depends="jar-core, jar-core-client, jar-jms, jar-jms-client, jar-jboss-integration, jar-jboss-service, jar-bootstrap, jar-logging, jar-ra, jar-mc, jar-jnp-client, jar-resources, sources-jar"> </target> - + <target name="jar-jnp-client" depends="init"> <jar jarfile="${build.jars.dir}/${jnp.client.jar.name}"> <zipfileset src="${org.jboss.naming.lib}/jnpserver.jar"> @@ -628,7 +635,7 @@ </zipfileset> </jar> </target> - + <target name="jar-mc" depends="init"> <jar jarfile="${build.jars.dir}/${mc.jar.name}"> <zipfileset src="./thirdparty/org/jboss/logging/lib/jboss-logging-spi.jar"/> @@ -639,9 +646,9 @@ <zipfileset src="./thirdparty/org/jboss/lib/jboss-mdr.jar"/> <zipfileset src="./thirdparty/org/jboss/lib/jbossxb.jar"/> <zipfileset src="./thirdparty/sun-jaxb/lib/jaxb-api.jar"/> - </jar> - </target> - + </jar> + </target> + <target name="jar-core" depends="compile-core"> <jar jarfile="${build.jars.dir}/${core.jar.name}"> @@ -657,7 +664,7 @@ </jar> </target> - + <target name="jar-core-sources"> <jar jarfile="${build.jars.dir}/${core.sources.jar.name}"> <fileset dir="${src.main.dir}"> @@ -700,19 +707,19 @@ </fileset> </jar> </target> - + <target name="jar-jms-client" depends="compile-jms"> - - <jar jarfile="${build.jars.dir}/${jms.client.jar.name}"> + + <jar jarfile="${build.jars.dir}/${jms.client.jar.name}"> <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/api/jms/**/*.class"/> <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/jms/client/*.class"/> <fileset dir="${build.jms.classes.dir}" includes="org/hornetq/jms/referenceable/*.class"/> </jar> - + </target> <target name="jar-jms-client-sources"> - <jar jarfile="${build.jars.dir}/${jms.client.sources.jar.name}"> + <jar jarfile="${build.jars.dir}/${jms.client.sources.jar.name}"> <fileset dir="${src.main.dir}"> <include name="org/hornetq/api/jms/**/*.*"/> <include name="org/hornetq/jms/client/**/*.*"/> @@ -720,7 +727,7 @@ </fileset> </jar> </target> - + <target name="jar-jboss-integration" depends="compile-jboss-integration"> <jar jarfile="${build.jars.dir}/${jboss.integration.jar.name}"> @@ -728,7 +735,7 @@ </jar> </target> - + <target name="jar-jboss-integration-sources"> <jar jarfile="${build.jars.dir}/${jboss.integration.sources.jar.name}"> <fileset dir="${src.main.dir}"> @@ -736,7 +743,7 @@ </fileset> </jar> </target> - + <!-- author: Lucas Amador --> <target name="jar-jboss-service" depends="compile-jboss-service"> @@ -753,7 +760,7 @@ </fileset> </jar> </target> - + <target name="jar-bootstrap" depends="compile-bootstrap"> <jar jarfile="${build.jars.dir}/${bootstrap.jar.name}"> @@ -769,7 +776,7 @@ </fileset> </jar> </target> - + <target name="jar-logging" depends="compile-logging"> <jar jarfile="${build.jars.dir}/${logging.jar.name}"> @@ -785,7 +792,7 @@ </fileset> </jar> </target> - + <target name="jar-core-client" depends="compile-core"> <jar jarfile="${build.jars.dir}/${core.client.jar.name}"> <fileset dir="${build.core.classes.dir}"> @@ -810,7 +817,7 @@ <include name="org/hornetq/spi/core/logging/*.class"/> <include name="org/hornetq/spi/core/protocol/*.class"/> <include name="org/hornetq/spi/core/remoting/*.class"/> - + <!-- required by SessionSendMessage --> <include name="org/hornetq/core/server/ServerMessage.class"/> <include name="org/hornetq/core/journal/EncodingSupport.class"/> @@ -843,14 +850,14 @@ <include name="org/hornetq/spi/core/logging/*.*"/> <include name="org/hornetq/spi/core/protocol/*.*"/> <include name="org/hornetq/spi/core/remoting/*.*"/> - + <!-- required by SessionSendMessage --> <include name="org/hornetq/core/server/ServerMessage.java"/> <include name="org/hornetq/core/journal/EncodingSupport.java"/> </fileset> </jar> </target> - + <target name="jar-ra" depends="jar-core-client, jar-jms-client, compile-ra"> <jar jarfile="${build.jars.dir}/${ra.jar.name}"> <fileset dir="${build.ra.classes.dir}"> @@ -905,13 +912,13 @@ </fileset> </jar> </target> - + <!-- ======================================================================================== --> <!-- Distribution targets --> <!-- ======================================================================================== --> <target name="bin-distro" depends="createthirdparty, jar, jar-core-client, jar-jms-client, validate-configuration"> - + <mkdir dir="${build.distro.dir}"/> <mkdir dir="${build.distro.lib.dir}"/> <mkdir dir="${build.distro.config.dir}"/> @@ -947,7 +954,8 @@ <include name="jndi.properties"/> <include name="logging.properties"/> <include name="stand-alone/**"/> - <include name="jboss-as/**"/> + <include name="jboss-as-4/**"/> + <include name="jboss-as-5/**"/> <exclude name="common/hornetq-version.properties" /> <exclude name="*examples-ant.properties"/> <exclude name="trunk"/> @@ -974,7 +982,8 @@ <chmod file="${build.distro.bin.dir}/run.sh" perm="ugo+rx"/> <chmod file="${build.distro.bin.dir}/stop.sh" perm="ugo+rx"/> <chmod file="${build.distro.bin.dir}/build.sh" perm="ugo+rx"/> - <chmod file="${build.distro.config.dir}/jboss-as/build.sh" perm="ugo+rx"/> + <chmod file="${build.distro.config.dir}/jboss-as-4/build.sh" perm="ugo+rx"/> + <chmod file="${build.distro.config.dir}/jboss-as-5/build.sh" perm="ugo+rx"/> <copy todir="${build.distro.bin.dir}"> <fileset dir="${native.bin.dir}"> <include name="*.so"/> @@ -988,7 +997,7 @@ </copy> <antcall target="dist-doc"/> - + <copy todir="${build.distro.licenses.dir}/"> <fileset dir="${licenses.dir}"> <include name="**"/> @@ -1010,9 +1019,9 @@ </copy> <chmod perm="ugo+rx" parallel="false" verbose="true"> - <fileset dir="${build.distro.examples.dir}"> - <include name="**/build.sh"/> - </fileset> + <fileset dir="${build.distro.examples.dir}"> + <include name="**/build.sh"/> + </fileset> </chmod> <mkdir dir="${build.distro.tools.dir}/ant"/> @@ -1022,7 +1031,7 @@ <include name="**"/> </fileset> </copy> - + <!-- examples-ant.properties allow the examples to be run from the source or from the distribution --> <!-- by configuring the correct lib/config location --> <copy tofile="${build.distro.examples.dir}/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" /> @@ -1101,7 +1110,7 @@ </copy> </target> - + <target name="userdoc"> <ant dir="./docs/user-manual" antfile="build.xml" target="all"/> <ant dir="./docs/quickstart-guide" antfile="build.xml" target="all"/> @@ -1109,7 +1118,7 @@ <target name="javadoc"> - <javadoc + <javadoc doclet="org.jboss.apiviz.APIviz" docletpath="${thirdparty.dir}/org/jboss/apiviz/lib/apiviz.jar" destdir="${build.api.dir}" @@ -1147,11 +1156,11 @@ </antcall> <antcall target="artifact"> - <param name="artifact.name" value="hornetq-jboss-as-integration"/> + <param name="artifact.name" value="hornetq-jboss-as-integration"/> </antcall> <antcall target="artifact"> - <param name="artifact.name" value="hornetq-logging"/> + <param name="artifact.name" value="hornetq-logging"/> </antcall> <property name="build.resources.dir" value="${build.dir}/resources"/> @@ -1170,7 +1179,7 @@ </jar> <antcall target="artifact"> - <param name="artifact.name" value="hornetq-resources"/> + <param name="artifact.name" value="hornetq-resources"/> </antcall> </target> @@ -1239,7 +1248,7 @@ <classpath refid="jms.test.compilation.classpath"/> </javac> </target> - + <target name="compile-joram-tests" depends="compile-jms-tests, compile-unit-tests"> <mkdir dir="${test.joram.classes.dir}"/> <javac target="${javac.target}" @@ -1269,18 +1278,18 @@ <param name="tests.param" value="**/org/hornetq/tests/integration/**/*${test-mask}.class"/> </antcall> </target> - + <target name="failover-tests" depends="jar, compile-unit-tests"> <antcall inheritall="true" inheritrefs="true" target="tests"> <param name="tests.param" value="**/org/hornetq/tests/integration/cluster/failover/**/*${test-mask}.class"/> </antcall> </target> - + <target name="distribution-tests" depends="jar, compile-unit-tests"> <antcall inheritall="true" inheritrefs="true" target="tests"> <param name="tests.param" value="**/org/hornetq/tests/integration/cluster/distribution/**/*${test-mask}.class"/> </antcall> - </target> + </target> <target name="concurrent-tests" depends="jar, compile-unit-tests"> <antcall inheritall="true" inheritrefs="true" target="tests"> @@ -1337,7 +1346,7 @@ haltonerror="${junit.batchtest.haltonerror}" failureproperty="tests.failed"> <formatter type="plain" usefile="${junit.formatter.usefile}"/> - <fileset dir="${test.classes.dir}"> + <fileset dir="${test.classes.dir}"> <!-- excluded because of https://jira.jboss.org/jira/browse/HORNETQ-65 --> <exclude name="**/cluster/failover/*StaticClusterWithBackupFailoverTest.class" /> <include name="${tests.param}"/> @@ -1387,7 +1396,7 @@ haltonfailure="${junit.batchtest.haltonfailure}" haltonerror="${junit.batchtest.haltonerror}"> <formatter type="plain" usefile="${junit.formatter.usefile}"/> - <fileset dir="${test.jms.classes.dir}"> + <fileset dir="${test.jms.classes.dir}"> <include name="**/jms/tests/**/${test-mask}.class"/> <exclude name="**/jms/tests/XARecoveryTest.class"/> <exclude name="**/jms/tests/XAResourceRecoveryTest.class"/> @@ -1398,7 +1407,7 @@ </batchtest> </junit> </target> - + <target name="joram-tests" depends="jar, compile-joram-tests"> <echo message=""/> <echo message="Running JORAM tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/> @@ -1431,7 +1440,7 @@ </fileset> </batchtest> </junit> - </target> + </target> <target name="stress-tests" depends="jar, compile-unit-tests"> <echo message=""/> @@ -1453,7 +1462,7 @@ <jvmarg value="-Xmx1024M"/> <jvmarg value="-Dmodule.output=./"/> <jvmarg value="-Djava.util.logging.config.file=src/config/trunk/non-clustered/logging.properties"/> - + <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"/>--> @@ -1464,7 +1473,7 @@ haltonerror="${junit.batchtest.haltonerror}"> <formatter type="plain" usefile="${junit.formatter.usefile}"/> <fileset dir="${test.classes.dir}"> - <include name="**/org/hornetq/tests/stress/**/*${test-mask}.class"/> + <include name="**/org/hornetq/tests/stress/**/*${test-mask}.class"/> </fileset> </batchtest> </junit> @@ -1571,8 +1580,8 @@ </emma> </target> - + <target name="findbugs" depends="jar"> <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/> <findbugs home="${findbugs.home}"