crossley 2003/03/05 00:11:22
Modified: . build.xml
Log:
Moved non-init stuff into the "prepare" target.
Revision Changes Path
1.352 +21 -20 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- build.xml 5 Mar 2003 02:20:15 -0000 1.351
+++ build.xml 5 Mar 2003 08:11:21 -0000 1.352
@@ -99,25 +99,6 @@
</fileset>
</path>
- <!-- Jing is used in various build targets for XML validation
- with RELAX NG -->
- <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"
- classpathref="classpath"/>
-
- <!-- Validate some important core config. Do default config files here,
- then do them again after the blocks have been processed. -->
- <jing rngfile="./src/webapp/WEB-INF/entities/any.rng">
- <fileset dir="./src/webapp/WEB-INF" includes="cocoon.xconf"/>
- </jing>
- <jing rngfile="./src/webapp/WEB-INF/entities/roles-v01.rng">
- <fileset dir="./src/java/org/apache/cocoon" includes="cocoon.roles"/>
- </jing>
-<!-- FIXME: recent sitemap changes have broken validation
- <jing rngfile="${build.webapp}/WEB-INF/entities/sitemap-v06.rng">
- <fileset dir="./src/webapp" includes="sitemap.xmap"/>
- </jing>
--->
-
<!-- Build and prepare the loader =================== -->
<!-- compile the loader -->
@@ -167,6 +148,26 @@
<echo>+-------------------------------------------------------------------------------+</echo>
<mkdir dir="${build}"/>
+
+ <!-- Jing is used in various build targets for XML validation
+ with RELAX NG -->
+ <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"
+ classpathref="classpath"/>
+
+ <!-- Validate some important core config. Do default config files here,
+ then do them again after the blocks have been processed. -->
+ <jing rngfile="./src/webapp/WEB-INF/entities/any.rng">
+ <fileset dir="./src/webapp/WEB-INF" includes="cocoon.xconf"/>
+ </jing>
+ <jing rngfile="./src/webapp/WEB-INF/entities/roles-v01.rng">
+ <fileset dir="./src/java/org/apache/cocoon" includes="cocoon.roles"/>
+ </jing>
+<!-- FIXME: recent sitemap changes have broken validation
+ <jing rngfile="${build.webapp}/WEB-INF/entities/sitemap-v06.rng">
+ <fileset dir="./src/webapp" includes="sitemap.xmap"/>
+ </jing>
+-->
+
</target>
<!-- Prepare the build directories -->
