1.) Created separate targets of 'test_all' for servlet 2.2 and 2.3
servlet engines to avoid name clashes.
2.) Please remove 'build-tests.xml' from the cvs, it was replaced by
'build-tests-22.xml' and 'build-tests-23.xml'.
3.) Target 'clean' now also deletes the Castor generated directories.
4.) Fixed indentation.
Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.96
diff -u -r1.96 build.xml
--- build.xml 2001/05/28 16:07:16 1.96
+++ build.xml 2001/05/30 10:06:15
@@ -352,44 +352,36 @@
<srcfiles dir="${src.xml.dir}" includes="**/*.xsd"/>
</uptodate>
</target>
-
+
<target name="apis" depends="prepare_apis" unless="apis.uptodate">
-
- <!-- regen psml -->
-
- <delete>
- <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api">
- <include name="portletmarkup/*.java"/>
- </fileset>
- </delete>
- <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
- <classpath refid="classpath"/>
- <arg value="-i" />
- <arg value="${src.xml.dir}/psml.xsd" />
- <arg value="-f" />
- <arg value="-dest" />
- <arg value="${src.java.dir}" />
- <arg value="-package" />
- <arg value="org.apache.jetspeed.xml.api.portletmarkup" />
- </java>
-
- <!-- regen jcm -->
-
- <delete>
- <fileset dir="${src.java.dir}/org/apache/jetspeed/xml/api">
- <include name="jcm/*.java"/>
- </fileset>
- </delete>
- <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
- <classpath refid="classpath"/>
- <arg value="-i" />
- <arg value="${src.xml.dir}/jetspeed-portal-content.xsd" />
- <arg value="-f" />
- <arg value="-dest" />
- <arg value="${src.java.dir}" />
- <arg value="-package" />
- <arg value="org.apache.jetspeed.xml.api.jcm" />
- </java>
+
+ <!-- regen psml -->
+
+ <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup"/>
+
+ <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
+ <classpath refid="classpath"/>
+ <arg value="-i" />
+ <arg value="${src.xml.dir}/psml.xsd" />
+ <arg value="-f" />
+ <arg value="-dest" />
+ <arg value="${src.java.dir}" />
+ <arg value="-package" />
+ <arg value="org.apache.jetspeed.xml.api.portletmarkup" />
+ </java>
+
+ <!-- regen jcm -->
+
+ <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm"/>
+ <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
+ <classpath refid="classpath"/>
+ <arg value="-i" />
+ <arg value="${src.xml.dir}/jetspeed-portal-content.xsd" />
+ <arg value="-f" />
+ <arg value="-dest" />
+ <arg value="${src.java.dir}" />
+ <arg value="-package" />
+ <arg value="org.apache.jetspeed.xml.api.jcm" />
+ </java>
</target>
@@ -464,12 +456,20 @@
<!-- =================================================================== -->
<!-- Run all Cactus tests for Servlet API 2.2 -->
<!-- =================================================================== -->
- <target name="tests_all"
-
depends="tests_resin_12,tests_tomcat_32,tests_orion_14,tests_weblogic_51,tests_resin_13,tests_tomcat_40"
- description="Run all Cactus tests for Servlet API 2.2 and 2.3">
+ <target name="tests_all_22"
+ depends="tests_resin_12,tests_tomcat_32,tests_orion_14,tests_weblogic_51"
+ description="Run all Cactus tests for Servlet API 2.2">
</target>
<!-- =================================================================== -->
+ <!-- Run all Cactus tests for Servlet API 2.3 -->
+ <!-- =================================================================== -->
+ <target name="tests_all_23"
+ depends="tests_resin_13,tests_tomcat_40"
+ description="Run all Cactus tests for Servlet API 2.3">
+ </target>
+
+ <!-- =================================================================== -->
<!-- Run the client JUnit test cases. This target should not be called -->
<!-- directly. It must be called by a test_XXX target (where XXX is the -->
<!-- name of the server - see included xml file for different servers) -->
@@ -635,8 +635,11 @@
<!-- =================================================================== -->
<!-- Cleans up the distribution -->
<!-- =================================================================== -->
- <target name="clean" description="Cleans up the distribution">
- <delete dir="${build.dir}"/>
+ <target name="clean" description="Cleans up the distribution"
+ >
+ <delete dir="${build.dir}"/>
+ <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/portletmarkup"/>
+ <delete dir="${src.java.dir}/org/apache/jetspeed/xml/api/jcm"/>
</target>
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
