adammurdoch 02/04/17 05:01:25
Modified: . build.xml
src/stylesheets build.xsl
container project.xml
Log:
- Build stylesheet tidy ups.
- Got container tests working.
Revision Changes Path
1.6 +5 -0 jakarta-ant-myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 17 Apr 2002 07:23:53 -0000 1.5
+++ build.xml 17 Apr 2002 12:01:25 -0000 1.6
@@ -44,6 +44,11 @@
<param name="target" value="main"/>
</antcall>
</target>
+ <target name="clean-projects" description="Cleans all of the projects">
+ <antcall target="for-all-projects">
+ <param name="target" value="clean"/>
+ </antcall>
+ </target>
<target name="rebuild-projects" description="Rebuilds all of the
projects">
<antcall target="for-all-projects">
<param name="target" value="rebuild"/>
1.3 +17 -11 jakarta-ant-myrmidon/src/stylesheets/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/src/stylesheets/build.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xsl 17 Apr 2002 07:23:54 -0000 1.2
+++ build.xsl 17 Apr 2002 12:01:25 -0000 1.3
@@ -41,6 +41,7 @@
<!--Properties for running the unit tests-->
<property name="test.classes" value="${{build.tests}}/classes"/>
+ <property name="test.working.dir" value="${{test.classes}}"/>
<property name="junit.fork" value="false"/>
<property name="junit.failonerror" value="true"/>
<property name="single.test" value="*"/>
@@ -58,7 +59,9 @@
</xsl:for-each>
</path>
<patternset id="project.compile.patternset">
- <xsl:copy-of select="build/compilePatterns/*"/>
+ <xsl:for-each select="build/compilePatterns">
+ <xsl:copy-of select="*|@*"/>
+ </xsl:for-each>
</patternset>
<target name="main" depends="jars" description="Builds the
project jars" />
@@ -129,6 +132,8 @@
<xsl:choose>
<xsl:when test="build/unitTestSourceDirectory">
+ <target name="compile" depends="compile-src,
compile-tests"/>
+
<target name="warn-no-junit" unless="junit.present">
<echo>WARNING: Could not find JUnit in the project
classpath. Skipping the unit tests.</echo>
</target>
@@ -157,7 +162,11 @@
</copy>
</target>
- <target name="test" depends="compile-tests"
if="junit.present" description="Runs the unit tests">
+ <target name="test-prepare">
+ <xsl:copy-of select="build/test-prepare/*"/>
+ </target>
+
+ <target name="test" depends="compile-tests,
test-prepare" if="junit.present" description="Runs the unit tests">
<mkdir dir="${{build.tests}}"/>
@@ -169,7 +178,7 @@
<classpath location="${{build.classes}}"/>
<classpath location="${{test.classes}}"/>
- <sysproperty key="test.basedir"
value="${{test.classes}}"/>
+ <sysproperty key="test.basedir"
file="${{test.classes}}"/>
<formatter type="xml"/> <!-- xml reports for
junitreport -->
<formatter type="plain"/> <!-- text reports for
humans -->
@@ -182,20 +191,17 @@
</fileset>
</batchtest>
</junit>
-
</target>
</xsl:when>
<xsl:otherwise>
- <target name="test">
+ <target name="compile" depends="compile-src"/>
+ <target name="test" depends="compile">
<echo>This project has no unit tests.</echo>
</target>
</xsl:otherwise>
</xsl:choose>
- <target name="jars" depends="compile-src" description="Builds
the project jar files">
- <xsl:if test="build/unitTestSourceDirectory">
- <xsl:attribute name="depends">compile-src,
compile-tests</xsl:attribute>
- </xsl:if>
+ <target name="jars" depends="compile" description="Builds the
project jar files">
<mkdir dir="${{build.lib}}"/>
<xsl:apply-templates select="build/jar|build/antlib"/>
</target>
@@ -276,7 +282,7 @@
<xsl:template match="jar|antlib">
<!-- Generate the manifest -->
- <redirect:write file="{id}.mf">
+ <redirect:write file="src/conf/{id}.mf">
<xsl:text>Manifest-Version: 1.0
Created-By: Apache Ant Project
</xsl:text>
@@ -330,7 +336,7 @@
<jar
jarfile="${{build.lib}}/{id}-{/project/currentVersion}.{$jarExt}"
basedir="${{build.classes}}"
compress="${{build.compress}}"
- manifest="{id}.mf">
+ manifest="src/conf/{id}.mf">
<metainf dir="${{build.conf}}/{id}" />
<patternset>
<xsl:copy-of select="patterns/*"/>
1.3 +61 -1 jakarta-ant-myrmidon/container/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/container/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 16 Apr 2002 11:10:25 -0000 1.2
+++ project.xml 17 Apr 2002 12:01:25 -0000 1.3
@@ -10,11 +10,16 @@
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<classpath>
- <fileset dir="../lib" includes="**/*.jar"/>
+ <ant-runtime/>
+ <fileset dir="../lib" includes="**/*.jar"
excludes="xml-apis.jar"/>
<fileset dir="../api/build/lib" includes="*.jar"/>
<fileset dir="../aut/build/lib" includes="*.jar"/>
</classpath>
+ <unitTestPatterns>
+ <exclude name="**/DependencyMetricsTestCase*"/>
+ </unitTestPatterns>
+
<jar>
<id>myrmidon-container</id>
<extension extension-name="myrmidon.container"
@@ -42,6 +47,61 @@
<include name="org/apache/myrmidon/launcher/**" />
</patterns>
</jar>
+
+ <test-prepare>
+ <!-- Prepare deployer tests -->
+ <property name="test.deployer.dir"
+
value="${test.working.dir}/org/apache/myrmidon/components/deployer/test"/>
+ <mkdir dir="${test.deployer.dir}"/>
+ <jar jarfile="${test.deployer.dir}/test.atl">
+ <zipfileset dir="${test.deployer.dir}" prefix="META-INF"
includes="*.xml"/>
+ </jar>
+
+ <!-- Prepare type factory tests -->
+ <property name="test.type.dir"
+
value="${test.working.dir}/org/apache/myrmidon/interfaces/type/test"/>
+ <mkdir dir="${test.type.dir}"/>
+ <jar jarfile="${test.type.dir}/types.jar">
+ <fileset dir="${test.classes}"
includes="org/apache/myrmidon/interfaces/type/test/MyType1.class"/>
+ </jar>
+
+ <!-- Prepare the class loader manager tests -->
+ <property name="test.classloader.pkg"
value="org/apache/myrmidon/components/classloader/test/libs"/>
+ <property name="test.classloader.dir"
value="${test.working.dir}/${test.classloader.pkg}/.."/>
+ <property name="test.classloader.classes"
value="${test.working.dir}/${test.classloader.pkg}"/>
+ <mkdir dir="${test.classloader.dir}/ext"/>
+ <jar jarfile="${test.classloader.dir}/common.jar">
+ <fileset dir="${test.classes}">
+ <include name="${test.classloader.pkg}/shared/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${test.classloader.dir}/no-dependencies.jar">
+ <fileset dir="${test.classes}">
+ <include name="${test.classloader.pkg}/shared/**"/>
+ <include name="${test.classloader.pkg}/unshared/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${test.classloader.dir}/one-dependency.jar"
+
manifest="src/test/${test.classloader.pkg}/one-dependency.mf">
+ <fileset dir="${test.classes}">
+ <include name="${test.classloader.pkg}/shared/**"/>
+ <include name="${test.classloader.pkg}/unshared/**"/>
+ </fileset>
+ </jar>
+ <copy file="${test.classloader.dir}/one-dependency.jar"
+ tofile="${test.classloader.dir}/one-dependency-2.jar"/>
+ <jar jarfile="${test.classloader.dir}/ext/simple-extension.jar"
+
manifest="src/test/${test.classloader.pkg}/simple-extension.mf" >
+ <fileset dir="${test.classes}">
+ <include name="${test.classloader.pkg}/shared/**"/>
+ <include name="${test.classloader.pkg}/extn/**"/>
+ </fileset>
+ </jar>
+ <jar jarfile="${test.classloader.dir}/ext/cycle-extension-1.jar"
+
manifest="src/test/${test.classloader.pkg}/cycle-extension-1.mf" />
+ <jar jarfile="${test.classloader.dir}/ext/cycle-extension-2.jar"
+
manifest="src/test/${test.classloader.pkg}/cycle-extension-2.mf" />
+ </test-prepare>
</build>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
