[jboss-svn-commits] JBL Code SVN: r8009 - in labs/jbossesb/trunk: product product/console qa
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 1 05:28:49 EST 2006
Author: kevin.conner at jboss.com
Date: 2006-12-01 05:28:47 -0500 (Fri, 01 Dec 2006)
New Revision: 8009
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/console/build.xml
labs/jbossesb/trunk/qa/build.xml
Log:
Updated for JBESB-255
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-12-01 09:31:07 UTC (rev 8008)
+++ labs/jbossesb/trunk/product/build.xml 2006-12-01 10:28:47 UTC (rev 8009)
@@ -1,6 +1,6 @@
<project name="JBESB" default="test" basedir=".">
<!-- class path behaviour -->
- <property name="build.sysclasspath" value="last"/>
+ <property name="build.sysclasspath" value="ignore"/>
<!-- Set module name -->
<property name="org.jboss.esb.internal.modulename" value="jbesb"/>
@@ -64,6 +64,24 @@
<property name="org.jboss.esb.internal.jar" location="lib"/>
<property name="org.jboss.esb.internal.javadocs.dest" location="javadocs"/>
<property name="org.jboss.esb.internal.samples.javadocs.dest" location="samples/javadocs"/>
+
+ <property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
+ <macrodef name="runant">
+ <attribute name="target"/>
+ <sequential>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ classpath="${ant.library.dir}/ant-launcher.jar"
+ fork="true" failonerror="true">
+ <sysproperty key="ant.home" value="${ant.home}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <arg value="-cp"/>
+ <arg value="${junit.jar}"/>
+ <arg value="-f"/>
+ <arg value="${ant.file}"/>
+ <arg value="@{target}"/>
+ </java>
+ </sequential>
+ </macrodef>
<!-- Initialisation -->
<target name="org.jboss.esb.internal.init">
@@ -100,7 +118,6 @@
<pathelement path="core/services/src/"/>
</path>
-
<property name="org.jboss.esb.javadocs.list"
value="org.jboss.soa.*"/>
@@ -161,7 +178,7 @@
<!-- produce a basic installation (minus docs and samples) -->
- <target name="install" depends="org.jboss.esb.jar">
+ <target name="org.jboss.esb.install" depends="org.jboss.esb.jar">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
@@ -188,7 +205,7 @@
<!-- produce a product distribution -->
- <target name="dist" depends="install, org.jboss.esb.javadocs, tools">
+ <target name="org.jboss.esb.dist" depends="install, org.jboss.esb.javadocs, tools">
<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
@@ -274,7 +291,7 @@
</target>
<!-- Build the tools into the main dist -->
- <target name="tools">
+ <target name="org.jboss.esb.tools">
<!-- Build the admin console webapp. -->
<ant dir="console" target="build">
<property name="build.dir" value="${org.jboss.esb.installationdirectory}/tools/console"/>
@@ -301,14 +318,34 @@
</target>
<!-- Short target names -->
- <target name="compile" depends="org.jboss.esb.compile"/>
- <target name="test" depends="org.jboss.esb.test"/>
- <target name="jar" depends="org.jboss.esb.jar"/>
- <target name="clean" depends="org.jboss.esb.clean"/>
- <target name="purge" depends="org.jboss.esb.purge"/>
- <target name="javadoc" depends="org.jboss.esb.javadocs"/>
-
-
+ <target name="compile">
+ <runant target="org.jboss.esb.compile"/>
+ </target>
+ <target name="install">
+ <runant target="org.jboss.esb.install"/>
+ </target>
+ <target name="dist">
+ <runant target="org.jboss.esb.dist"/>
+ </target>
+ <target name="tools">
+ <runant target="org.jboss.esb.tools"/>
+ </target>
+ <target name="test">
+ <runant target="org.jboss.esb.test"/>
+ </target>
+ <target name="jar">
+ <runant target="org.jboss.esb.jar"/>
+ </target>
+ <target name="clean">
+ <runant target="org.jboss.esb.clean"/>
+ </target>
+ <target name="purge">
+ <runant target="org.jboss.esb.purge"/>
+ </target>
+ <target name="javadoc">
+ <runant target="org.jboss.esb.javadocs"/>
+ </target>
+
<target name="deploy" depends="jar">
<ant dir="install" target="configure"/>
</target>
@@ -316,5 +353,4 @@
<target name="instr-report">
<ant dir="core" target="instr-report"/>
</target>
-
</project>
Modified: labs/jbossesb/trunk/product/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/build.xml 2006-12-01 09:31:07 UTC (rev 8008)
+++ labs/jbossesb/trunk/product/console/build.xml 2006-12-01 10:28:47 UTC (rev 8009)
@@ -102,7 +102,7 @@
<path id="src.compile.classpath">
<fileset dir="${resources.dir}/WEB-INF/lib" includes="*.jar" />
- <fileset dir="${product.lib.ext.dir}" includes="milyn*.jar" />
+ <fileset dir="${product.lib.ext.dir}" includes="milyn*.jar, junit*.jar" />
</path>
<path id="test.classpath">
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2006-12-01 09:31:07 UTC (rev 8008)
+++ labs/jbossesb/trunk/qa/build.xml 2006-12-01 10:28:47 UTC (rev 8009)
@@ -1,24 +1,64 @@
-<project name="JBESB-QA" default="test" basedir=".">
-
- <property file="test.properties" />
- <property file="${basedir}../product/install/deployment.properties" />
-
- <target name="test" depends="test.junit" description="Run all QA tests." />
- <target name="ci-test" depends="ci-test.junit" description="Run all QA tests." />
-
- <target name="test.junit" description="Run JUnit based QA tests.">
- <ant dir="junit" target="test" />
- </target>
-
- <target name="ci-test.junit" description="Run JUnit based QA tests.">
- <ant dir="junit" target="ci-test" />
- </target>
-
- <target name="clean" description="Clean the QA env">
- <echo message="Cleaning..."/>
-
- <delete dir="${basedir}/build" />
- <delete file="${basedir}/qatests.log" />
- </target>
+<project name="JBESB-QA" default="test" basedir=".">
+
+ <property name="build.sysclasspath" value="ignore"/>
+
+ <property file="test.properties" />
+ <property file="${basedir}../product/install/deployment.properties" />
+
+ <property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
+ <macrodef name="runant">
+ <attribute name="target"/>
+ <sequential>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ classpath="${ant.library.dir}/ant-launcher.jar"
+ fork="true" failonerror="true">
+ <sysproperty key="ant.home" value="${ant.home}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <arg value="-cp"/>
+ <arg value="${junit.jar}"/>
+ <arg value="-f"/>
+ <arg value="${ant.file}"/>
+ <arg value="@{target}"/>
+ </java>
+ </sequential>
+ </macrodef>
+
+ <target name="test" description="Run all QA tests.">
+ <runant target="test.junit"/>
+ </target>
+
+ <target name="ci-test" description="Run all QA tests.">
+ <runant target="ci-test.junit"/>
+ </target>
-</project>
+ <target name="test.junit" description="Run JUnit based QA tests.">
+ <ant dir="junit" target="test" />
+ </target>
+
+ <target name="ci-test.junit" description="Run JUnit based QA tests.">
+ <ant dir="junit" target="ci-test" />
+ </target>
+
+ <target name="clean" description="Clean the QA env">
+ <echo message="Cleaning..."/>
+
+ <delete dir="${basedir}/build" />
+ <delete file="${basedir}/qatests.log" />
+ </target>
+
+ <target name="ant">
+ <property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ classpath="${ant.library.dir}/ant-launcher.jar"
+ fork="true" failonerror="true">
+ <sysproperty key="ant.home" value="${ant.home}"/>
+ <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+ <arg value="-cp"/>
+ <arg value="${junit.jar}"/>
+ <arg value="-f"/>
+ <arg value="${ant.file}"/>
+ <arg value="${target}"/>
+ </java>
+ </target>
+
+</project>
More information about the jboss-svn-commits
mailing list