crossley 2002/11/14 18:47:06
Modified: . build.xml properties.xml
Log:
Changed Ant target name from "validate" to validate-config".
Added ability to switch validate-config on/off using properties.xml
Revision Changes Path
1.279 +9 -7 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- build.xml 11 Nov 2002 09:49:24 -0000 1.278
+++ build.xml 15 Nov 2002 02:47:05 -0000 1.279
@@ -203,6 +203,9 @@
<xmlproperty file="properties.xml"
keeproot="false"
collapseAttributes="true" />
+ <condition property="validate.config">
+ <istrue value="${build.validate.config}"/>
+ </condition>
<echo message="--------------------------------------------------------------"/>
<echo message=" ${fullname} ${version} [${year}] "/>
@@ -2153,16 +2156,15 @@
</target>
<!-- =================================================================== -->
- <!-- Validation using RELAX NG -->
+ <!-- Validation of core important configuration files using RELAX NG -->
<!-- =================================================================== -->
<!-- Depends on some "prepare-*" targets, so that the sitemaps are generated
and copied to the build.
-FIXME: Why does prepare-webapp depend on copy-webapp? This means that "compile"
-target is also called, which is un-necessary for the 'validate' target.
-->
- <target name="validate" description="Validation using RELAX NG"
- depends="prepare-docs, prepare-webapp, prepare-webapp-scratchpad">
- <echo message="Validating various XML instances using RELAX NG."/>
+ <target name="validate-config"
+ description="Validation of core configuration files using RELAX NG"
+ depends="prepare-docs, prepare-webapp, prepare-webapp-scratchpad"
+ if="validate.config">
<taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
<classpath refid="anttasks.classpath"/>
</taskdef>
@@ -2192,7 +2194,7 @@
<!-- sitemap.xmap -->
<!-- leaving this until last because it is the one most likely to break -->
<echo message="Validating all sitemap.xmap instances ..."/>
- <echo message="FIXME: The sitemaps and their RNG grammar still need tweaking."/>
+<!-- FIXME: The sitemaps and their RNG grammar still need tweaking -->
<jing rngfile="${webapp.dir}/WEB-INF/entities/sitemap-v05.rng">
<fileset dir="${build.dir}" includes="**/sitemap.xmap"/>
</jing>
1.11 +4 -0 xml-cocoon2/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 29 Oct 2002 15:52:56 -0000 1.10
+++ properties.xml 15 Nov 2002 02:47:05 -0000 1.11
@@ -76,6 +76,10 @@
<blocks
root="./build/cocoon/blocks" />
+
+ <!-- build-time validation of important core configuration files -->
+ <validate
+ config="true" />
</build>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
