[jboss-svn-commits] JBL Code SVN: r7911 - in labs/jbossesb/trunk: . product product/core product/core/listeners product/core/listeners/tests product/core/rosetta product/core/rosetta/tests product/core/services product/core/services/tests product/install qa qa/junit
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 28 18:45:48 EST 2006
Author: kevin.conner at jboss.com
Date: 2006-11-28 18:45:42 -0500 (Tue, 28 Nov 2006)
New Revision: 7911
Added:
labs/jbossesb/trunk/integration-build.xml
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/qa/build.xml
labs/jbossesb/trunk/qa/junit/build.xml
Log:
Updated build files to generate absolute properties, added top level build
Added: labs/jbossesb/trunk/integration-build.xml
===================================================================
--- labs/jbossesb/trunk/integration-build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/integration-build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -0,0 +1,13 @@
+<project name="JBESB-QA" default="integration" basedir=".">
+ <target name="integration" description="Run Continuous Integration.">
+ <ant dir="product">
+ <target name="clean"/>
+ <target name="test"/>
+ <target name="install"/>
+ </ant>
+ <ant dir="qa">
+ <target name="clean"/>
+ <target name="ci-test"/>
+ </ant>
+ </target>
+</project>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -5,25 +5,25 @@
<!-- Set module name -->
<property name="org.jboss.esb.internal.modulename" value="jbesb"/>
- <property name="org.jboss.esb.jboss.home" value="."/>
+ <property name="org.jboss.esb.jboss.home" location="."/>
<!-- Product properties file -->
<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
<!-- Set default properties filename -->
- <property name="org.jboss.esb.properties" value="product.properties"/>
+ <property name="org.jboss.esb.properties" location="product.properties"/>
<property name="org.jboss.esb.deployment.properties" location="install/deployment.properties"/>
<!-- Some default build locations -->
- <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar.dest" value="${basedir}/build/dist/lib"/>
+ <property name="org.jboss.esb.internal.dest" location="build"/>
+ <property name="org.jboss.esb.internal.jar.dest" location="build/dist/lib"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.properties}"/>
<property file="${org.jboss.esb.deployment.properties}"/>
<!-- Set internal property defaults -->
- <property name="org.jboss.esb.installationdirectory" value="${basedir}/build/dist"/>
+ <property name="org.jboss.esb.installationdirectory" location="build/dist"/>
<!-- Exclude from javadocs -->
<property name="org.jboss.esb.javadocs.exclude" value="org.jboss.soa.esb.internal.*, org.jboss.soa.esb.services.beans.*"/>
@@ -60,10 +60,10 @@
<!-- Path names -->
<property name="org.jboss.esb.internal.core" value="esb"/>
- <property name="org.jboss.esb.internal.dest" value="${basedir}/build"/>
- <property name="org.jboss.esb.internal.jar" value="${basedir}/lib"/>
- <property name="org.jboss.esb.internal.javadocs.dest" value="${basedir}/javadocs"/>
- <property name="org.jboss.esb.internal.samples.javadocs.dest" value="${basedir}/samples/javadocs"/>
+ <property name="org.jboss.esb.internal.dest" location="build"/>
+ <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"/>
<!-- Initialisation -->
<target name="org.jboss.esb.internal.init">
Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -62,8 +62,8 @@
<ant dir="services" target="jar"/>
</target>
- <property name="classes.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage"/>
+ <property name="classes.dir" location="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage"/>
<target name="instr-report">
<emma>
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -2,15 +2,15 @@
<project name="BuildJbossEsbListeners" default="org.jboss.esb.listeners.compile" basedir=".">
<property name="org.jboss.esb.listeners.jar.name" value="jbossesb-listeners"/>
- <property name="org.jboss.esb.listeners.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.listeners.classes.dir" value="${org.jboss.esb.internal.dest}/classes/listeners"/>
- <property name="org.jboss.esb.listeners.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
+ <property name="org.jboss.esb.listeners.distrib.dir" location="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.listeners.classes.dir" location="${org.jboss.esb.internal.dest}/classes/listeners"/>
+ <property name="org.jboss.esb.listeners.src.dir" location="src"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
<property environment="env"/>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -1,28 +1,28 @@
<?xml version="1.0"?>
<project name="build.listeners.tests" default="org.jboss.esb.listeners.tests.compile" basedir=".">
- <property name="org.jboss.esb.module.src.dir" value="../src"/>
- <property name="org.jboss.esb.module.classes.root.dir" value="${org.jboss.esb.internal.dest}/classes"/>
- <property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/listeners"/>
- <property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
- <property name="org.jboss.esb.module.tests.conf.dir" value="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
+ <property name="org.jboss.esb.module.src.dir" location="../src"/>
+ <property name="org.jboss.esb.module.classes.root.dir" location="${org.jboss.esb.internal.dest}/classes"/>
+ <property name="org.jboss.esb.module.classes.dir" location="${org.jboss.esb.internal.dest}/classes/listeners"/>
+ <property name="org.jboss.esb.module.tests.src.dir" location="src"/>
+ <property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
+ <property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
+ <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
+ <property name="org.jboss.esb.module.tests.conf.dir" location="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
<property environment="env"/>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
+ <fileset dir="${org.jboss.esb.ext.lib.dir}"
excludes="*.jar" includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
- <fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
@@ -31,7 +31,7 @@
<fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all.jar"/>
<!--
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
+ <fileset dir="${org.jboss.esb.ext.lib.dir}"
includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar emma.jar emma_ant.jar"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
-->
@@ -69,8 +69,8 @@
<!-- T E S T -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.listeners.internal.test">
- <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/listeners"/>
- <property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+ <property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/listeners"/>
+ <property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<!-- Instrument the code for code coverage - using emma... -->
<delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -2,15 +2,15 @@
<project name="BuildJbossEsbRosetta" default="org.jboss.esb.rosetta.compile" basedir=".">
<property name="org.jboss.esb.rosetta.jar.name" value="jbossesb-rosetta"/>
- <property name="org.jboss.esb.rosetta.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.rosetta.classes.dir" value="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <property name="org.jboss.esb.rosetta.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
+ <property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
+ <property name="org.jboss.esb.rosetta.src.dir" location="src"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
<property environment="env"/>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -1,30 +1,30 @@
<?xml version="1.0"?>
<project name="build.rosetta.tests" default="org.jboss.esb.rosetta.tests.compile" basedir=".">
- <property name="org.jboss.esb.internal.dest" value="${basedir}/../../../build"/>
- <property name="org.jboss.esb.module.src.dir" value="../src"/>
- <property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
- <property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+ <property name="org.jboss.esb.internal.dest" location="../../../build"/>
+ <property name="org.jboss.esb.module.src.dir" location="../src"/>
+ <property name="org.jboss.esb.module.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
+ <property name="org.jboss.esb.module.tests.src.dir" location="src"/>
+ <property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
+ <property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
+ <property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
+ <property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<property environment="env"/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
<!-- Set deployment properties filename -->
- <property name="org.jboss.esb.deployment.properties" value="../../../install/deployment.properties"/>
+ <property name="org.jboss.esb.deployment.properties" location="../../../install/deployment.properties"/>
<!-- Load deployment properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
- <pathelement location="${org.jboss.esb.root.dir}/rosetta/tests/resources/etc"/>
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
+ <pathelement location="${org.jboss.esb.root.dir}/core/rosetta/tests/resources/etc"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
<fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all.jar"/>
@@ -90,6 +90,7 @@
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test.exec">
<echo message="Running tests for module"/>
+
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -2,26 +2,26 @@
<project name="JbossEsbServices" default="org.jboss.esb.services.compile" basedir=".">
- <property name="org.jboss.esb.internal.dest" value="${basedir}/../../build"/>
+ <property name="org.jboss.esb.internal.dest" location="../../build"/>
<property name="org.jboss.esb.services.name.jar" value="${ant.project.name}.jar"/>
- <property name="org.jboss.esb.services.dist.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.services.appl.dir" value="../.."/>
- <property name="org.jboss.esb.services.metainf.dir" value="src/META-INF"/>
+ <property name="org.jboss.esb.services.dist.dir" location="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.services.appl.dir" location="../.."/>
+ <property name="org.jboss.esb.services.metainf.dir" location="src/META-INF"/>
- <property name="org.jboss.esb.services.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
- <property name="org.jboss.esb.services.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.services.rules.dir" value="${basedir}/rules"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
+ <property name="org.jboss.esb.services.classes.dir" location="${org.jboss.esb.internal.dest}/classes/services"/>
+ <property name="org.jboss.esb.services.src.dir" location="src"/>
+ <property name="org.jboss.esb.services.rules.dir" location="rules"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
<property environment="env"/>
- <property name="org.jboss.esb.ext.serverlib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <condition property="org.jboss.esb.ext.serverlib.dir" value="{org.jboss.esb.jboss.home}/server/all/lib">
+ <property name="org.jboss.esb.ext.serverlib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <condition property="org.jboss.esb.ext.serverlib.dir" value="${org.jboss.esb.jboss.home}/server/all/lib">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/lib">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -3,30 +3,30 @@
<property file="../../../../install/deployment.properties"/>
- <property name="org.jboss.esb.internal.dest" value="${basedir}/../../../build"/>
+ <property name="org.jboss.esb.internal.dest" location="../../../build"/>
- <property name="org.jboss.esb.module.src.dir" value="../src"/>
- <property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/services"/>
- <property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
- <property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
+ <property name="org.jboss.esb.module.src.dir" location="../src"/>
+ <property name="org.jboss.esb.module.classes.dir" location="${org.jboss.esb.internal.dest}/classes/services"/>
+ <property name="org.jboss.esb.module.tests.src.dir" location="src"/>
+ <property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
+ <property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
+ <property name="org.jboss.esb.root.dir" location="../.."/>
<property environment="env"/>
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ext/ejb3_embedded"/>
- <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
+ <property name="org.jboss.esb.ejb3_conf.tests.src.dir" location="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.tests.base.classpath">
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
+ <fileset dir="${org.jboss.esb.ext.lib.dir}"
excludes="*.jar" includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
- <fileset dir="../${org.jboss.esb.ext.lib.dir}"
+ <fileset dir="${org.jboss.esb.ext.lib.dir}"
includes="*.jar" excludes="jbossall-client.jar"/>
- <pathelement location="${basedir}/../rules"/>
+ <pathelement location="../rules"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
@@ -65,8 +65,8 @@
<!-- T E S T -->
<!-- ====================================================================== -->
<target name="org.jboss.esb.services.internal.test">
- <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/services"/>
- <property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
+ <property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/services"/>
+ <property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
<mkdir dir="${org.jboss.esb.module.tests.coverage.dir}" />
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/product/install/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -1,15 +1,15 @@
<project name="JBESB_Config" default="configure.jboss" basedir=".">
<!-- Set deployment properties filename -->
- <property name="org.jboss.esb.deployment.properties" value="deployment.properties"/>
+ <property name="org.jboss.esb.deployment.properties" location="deployment.properties"/>
<!-- Load Build Properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <property name="org.jboss.esb.ext.lib" value="${basedir}/../lib/ext"/>
- <property name="org.jboss.esb.deployment.conf" value="${basedir}/conf"/>
- <property name="org.jboss.esb.deployment.deploy" value="${basedir}/deploy"/>
- <property name="org.jboss.esb.deployment.data" value="${basedir}/database"/>
+ <property name="org.jboss.esb.ext.lib" location="../lib/ext"/>
+ <property name="org.jboss.esb.deployment.conf" location="conf"/>
+ <property name="org.jboss.esb.deployment.deploy" location="deploy"/>
+ <property name="org.jboss.esb.deployment.data" location="database"/>
<target name="init">
<condition property="hsql.set" value="true">
@@ -66,7 +66,7 @@
<target name="create-hsqldb" if="create.set">
<echo>Installing hsql JBossESB database</echo>
- <property name="data.hypersonic" value="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" />
+ <property name="data.hypersonic" location="${org.jboss.esb.appserver.home}/server/${org.jboss.esb.appserver.config}/data/hypersonic" />
<mkdir dir="${data.hypersonic}"/>
<copy file="${org.jboss.esb.deployment.data}/JBossESB-DB-HSQL.sql"
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/qa/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -1,7 +1,7 @@
<project name="JBESB-QA" default="test" basedir=".">
<property file="test.properties" />
- <property file="../product/install/deployment.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." />
@@ -17,8 +17,8 @@
<target name="clean" description="Clean the QA env">
<echo message="Cleaning..."/>
- <delete dir="build" />
- <delete file="qatests.log" />
+ <delete dir="${basedir}/build" />
+ <delete file="${basedir}/qatests.log" />
</target>
</project>
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2006-11-28 23:20:22 UTC (rev 7910)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2006-11-28 23:45:42 UTC (rev 7911)
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<project name="JUnit" default="test" basedir=".">
- <property name="product" value="../../product"/>
- <property name="product.build" value="${product}/build"/>
- <property name="product.lib" value="${product.build}/dist/lib"/>
- <property name="coverage" value="${product.build}/tests/coverage"/>
- <property name="build.lib" value="${product}/lib"/>
- <property name="qa.build" value="../build"/>
- <property name="qa.lib" value="../lib"/>
- <property name="qa.junit.src" value="src"/>
- <property name="qa.junit.classes" value="${qa.build}/junit/classes"/>
- <property name="qa.junit.report" value="${qa.build}/junit/report" />
+ <property name="product" location="../../product"/>
+ <property name="product.build" location="${product}/build"/>
+ <property name="product.lib" location="${product.build}/dist/lib"/>
+ <property name="coverage" location="${product.build}/tests/coverage"/>
+ <property name="build.lib" location="${product}/lib"/>
+ <property name="qa.build" location="../build"/>
+ <property name="qa.lib" location="../lib"/>
+ <property name="qa.junit.src" location="src"/>
+ <property name="qa.junit.classes" location="${qa.build}/junit/classes"/>
+ <property name="qa.junit.report" location="${qa.build}/junit/report" />
<property name="qa.junit.memory" value="128m"/>
<path id="base.cp">
@@ -47,6 +47,7 @@
<!-- Run the tests... -->
<property name="tests.filter" value="*"/>
<mkdir dir="${qa.junit.report}"/>
+ <property name="org.jboss.soa.esb.paramsRepository.file.root" location="src" />
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="yes" fork="true">
<formatter type="plain" usefile="false"/>
<formatter type="xml"/>
@@ -63,7 +64,7 @@
<jvmarg value="-Xmx${qa.junit.memory}"/>
<!-- Listener Sys Props... -->
- <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root" value="junit/src" />
+ <sysproperty key="org.jboss.soa.esb.paramsRepository.file.root" value="${org.jboss.soa.esb.paramsRepository.file.root}"/>
<!-- Sys Props from the test.properties file... -->
<sysproperty key="org.jboss.soa.esb.jndi.server.type" value="${org.jboss.soa.esb.jndi.server.type}" />
@@ -128,7 +129,7 @@
<jvmarg value="-Xmx${qa.junit.memory}"/>
<!-- emma jvm args -->
- <jvmarg value="-Demma.coverage.out.file=../product/build/tests/coverage/all/coverage.emma" />
+ <jvmarg value="-Demma.coverage.out.file=${coverage}/all/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
<!-- Listener Sys Props... -->
More information about the jboss-svn-commits
mailing list