[jboss-cvs] system2 ...
Scott Stark
scott.stark at jboss.com
Sun Jul 16 21:37:46 EDT 2006
User: starksm
Date: 06/07/16 21:37:46
Modified: system2 build-test.xml
Log:
Synch up the ant build with the eclipse setup
Revision Changes Path
1.5 +163 -172 system2/build-test.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build-test.xml
===================================================================
RCS file: /cvsroot/jboss/system2/build-test.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- build-test.xml 15 Jul 2006 18:44:27 -0000 1.4
+++ build-test.xml 17 Jul 2006 01:37:46 -0000 1.5
@@ -46,9 +46,16 @@
<!-- =================== -->
<!-- Module name(s) & version -->
- <property name="module.name" value="container"/>
- <property name="module.Name" value="JBoss Container"/>
- <property name="module.version" value="M1"/>
+ <property name="module.name" value="container" />
+ <property name="module.Name" value="JBoss Container" />
+ <property name="module.version" value="M1" />
+ <!-- jbosstest.deploy.dir is a URI -->
+ <pathconvert targetos="unix" property="jbosstest.deploy.path">
+ <path>
+ <pathelement location="${module.output}/lib" />
+ </path>
+ </pathconvert>
+ <property name="jbosstest.deploy.dir" value="file:${jbosstest.deploy.path}" />
<!-- ========= -->
<!-- Libraries -->
@@ -58,14 +65,14 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="junit.junit.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
+ <path refid="junit.junit.classpath" />
+ <path refid="gnu.getopt.classpath" />
+ <path refid="javassist.classpath" />
+ <path refid="apache.log4j.classpath" />
+ <path refid="oswego.concurrent.classpath" />
<path refid="jboss.jbossxb.classpath" />
<path refid="jboss.common.classpath" />
- <path refid="jboss.profiler.jvmti.classpath"/>
- <path refid="jboss.profiler.jvmti.classpath"/>
+ <path refid="jboss.profiler.jvmti.classpath" />
</path>
<!-- ======= -->
@@ -74,48 +81,50 @@
&modules;
<!-- this -->
- <property name="jboss.this.root" value="${module.root}/output"/>
- <property name="jboss.this.lib" value="${jboss.this.root}/lib"/>
+ <property name="jboss.this.root" value="${module.root}/output" />
+ <property name="jboss.this.lib" value="${jboss.this.root}/lib" />
<path id="jboss.this.classpath">
<fileset dir="${jboss.this.lib}">
- <include name="*.jar"/>
- <exclude name="${jar.prefix}.jar"/>
+ <include name="*.jar" />
+ <exclude name="${jar.prefix}.jar" />
</fileset>
</path>
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.container.classpath"/>
- <path refid="jboss.dependency.classpath"/>
- <path refid="jboss.kernel.classpath"/>
- <path refid="jboss.j2se.classpath"/>
- <path refid="jboss.mbeans.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <path refid="jboss.container.classpath" />
+ <path refid="jboss.dependency.classpath" />
+ <path refid="jboss.kernel.classpath" />
+ <path refid="jboss.j2se.classpath" />
+ <path refid="jboss.mbeans.classpath" />
+ <path refid="jboss.test.classpath" />
<pathelement location="output/classes" />
+ <pathelement location="src/resources/tests/bootstrap" />
+ <pathelement location="src/resources/tests/conf" />
+ <pathelement location="src/resources/tests/xml" />
</path>
<!-- ===== -->
<!-- Tasks -->
<!-- ===== -->
- <property name="source.java" value="${module.source}/tests"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
- <property name="build.classes" value="${module.output}/classes-tests"/>
- <property name="build.testlog" value="${module.output}/log"/>
- <property name="build-bypass.disabled" value="true"/>
+ <property name="source.java" value="${module.source}/tests" />
+ <property name="javac.target" value="1.5" />
+ <property name="javac.source" value="1.5" />
+ <property name="build.classes" value="${module.output}/classes-tests" />
+ <property name="build.testlog" value="${module.output}/log" />
+ <property name="build-bypass.disabled" value="true" />
- <call target="_default:task-init"/>
+ <call target="_default:task-init" />
<path id="thirdparty.classpath">
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
+ <path refid="library.classpath" />
+ <path refid="dependentmodule.classpath" />
</path>
</target>
- <property name="jbosstest.deploy.dir" value="${module.output}/lib" />
<patternset id="compile-resources.pattern">
- <include name="${src.resources}/**"/>
+ <include name="${src.resources}/**" />
</patternset>
<!-- ================================================================== -->
@@ -130,10 +139,7 @@
| documentation compiles.
-->
- <target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes, _default:compile-resources"
- />
+ <target name="compile" description="Compile all source files." depends="_default:compile-classes, _default:compile-resources" />
<!-- ================================================================== -->
<!-- Archives -->
@@ -145,7 +151,7 @@
<target name="module-jars" depends="init">
<jar jarfile="${build.lib}/jboss-system-test.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}"/>
+ <fileset dir="${build.classes}" />
</jar>
<jar destfile="${build.lib}/org.jboss.server.support.jar">
@@ -165,91 +171,76 @@
<!-- Tests -->
<!-- ================================================================== -->
- <target name="tests" depends="most"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
+ <target name="tests" depends="most" description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}" />
+ <mkdir dir="${build.testlog}" />
<!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${module.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
- <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}" />
<classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="javac.classpath"/>
- <path refid="apache.xerces.classpath"/>
+ <pathelement location="${build.classes}" />
+ <pathelement location="${build.resources}" />
+ <path refid="javac.classpath" />
+ <path refid="apache.xerces.classpath" />
</classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
- <batchtest todir="${build.reports}"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/**/*TestCase.class"/>
+ <include name="org/jboss/test/**/*TestCase.class" />
</fileset>
</batchtest>
</junit>
</target>
- <target name="one-test" depends="init"
- description="Execute all tests in the given test directory.">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
+ <target name="one-test" depends="init" description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}" />
+ <mkdir dir="${build.testlog}" />
<!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log"/>
- <junit dir="${module.output}"
- printsummary="yes"
- haltonerror="false"
- haltonfailure="false"
- fork="true">
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${module.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
- <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}" />
<syspropertyset id="jbosstest-properties">
- <propertyref prefix="jbosstest"/>
+ <propertyref prefix="jbosstest" />
</syspropertyset>
<classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="thirdparty.classpath"/>
+ <pathelement location="${build.classes}" />
+ <pathelement location="${build.resources}" />
+ <path refid="thirdparty.classpath" />
+ <path refid="apache.xerces.classpath"/>
</classpath>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
- <test todir="${build.reports}" name="${test}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}"/>
+ <test todir="${build.reports}" name="${test}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" />
</junit>
</target>
<target name="memory-test" depends="most" description="Execute MemoryLeakTestCase">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
+ <mkdir dir="${build.reports}" />
+ <mkdir dir="${build.testlog}" />
<junit printsummary="yes" fork="yes" haltonfailure="no">
<classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="thirdparty.classpath"/>
- <path refid="javac.classpath"/>
- <path refid="apache.xerces.classpath"/>
+ <pathelement location="${build.classes}" />
+ <pathelement location="${build.resources}" />
+ <path refid="thirdparty.classpath" />
+ <path refid="javac.classpath" />
+ <path refid="apache.xerces.classpath" />
</classpath>
- <jvmarg value="-agentlib:jbossAgent"/>
- <formatter type="plain" usefile="true"/>
- <formatter type="xml" usefile="true"/>
- <test fork="yes" todir="${build.reports}" name="org.jboss.test.memorytests.ClassInfoMemoryTestCase"/>
+ <jvmarg value="-agentlib:jbossAgent" />
+ <formatter type="plain" usefile="true" />
+ <formatter type="xml" usefile="true" />
+ <test fork="yes" todir="${build.reports}" name="org.jboss.test.memorytests.ClassInfoMemoryTestCase" />
</junit>
</target>
More information about the jboss-cvs-commits
mailing list