1. add validate-schema-rnc, validate-profiles targets for ANT build;
authorGlenn Adams <glenn@skynav.com>
Fri, 08 May 2009 15:06:41 +0000
changeset 118 27b02908bf3a
parent 117 f6dece3a9c01
child 119 e526e4f41427
1. add validate-schema-rnc, validate-profiles targets for ANT build;
2. add the above two targets as dependencies for validate target for ANT build;
3. fix validity error in profiles/dfxp-*.xml files;
spec/build.xml
spec/profiles/dfxp-presentation.xml
spec/profiles/dfxp-transformation.xml
--- a/spec/build.xml	Fri May 08 14:48:00 2009 +0000
+++ b/spec/build.xml	Fri May 08 15:06:41 2009 +0000
@@ -12,6 +12,11 @@
 	<property name="generateBPlist" value="generateBPlist.xsl"/>
     <property name="diffformat" value="diffspec.xsl"/>
     <property name="last-public-draft" value="20070706"/>
+    
+    <property name="jing.jar" value="${basedir}/jing/jing.jar"/>
+    <property name="rnc.dir" value="${basedir}/rnc"/>
+    <property name="rnc.schema" value="${rnc.dir}/ttaf1-dfxp.rnc"/>
+    <property name="profiles.dir" value="${basedir}/profiles"/>
 
     <patternset id="escapable">
       <include name="examples/*.xml"/>
@@ -39,6 +44,32 @@
         <delete quiet="true" file="ttaf1-dfxp.html"/>
     </target>
 
+    <target name="validate-schema-rnc" description="Validates DFXP's RNC Schema.">
+        <java fork="true" jar="${jing.jar}" dir="${rnc.dir}">
+            <arg value="-c"/>
+            <arg value="ttaf1-dfxp.rnc"/>
+        </java>
+    </target>
+
+    <target name="validate-profile-presentation" description="Validates presentation profile.">
+        <java fork="true" jar="${jing.jar}">
+            <arg value="-c"/>
+            <arg value="${rnc.schema}"/>
+            <arg value="${profiles.dir}/dfxp-presentation.xml"/>
+        </java>
+    </target>
+
+    <target name="validate-profile-transformation" description="Validates transformation profile.">
+        <java fork="true" jar="${jing.jar}">
+            <arg value="-c"/>
+            <arg value="${rnc.schema}"/>
+            <arg value="${profiles.dir}/dfxp-presentation.xml"/>
+        </java>
+    </target>
+
+    <target name="validate-profiles"
+	    depends="validate-profile-presentation,validate-profile-transformation"/>
+
     <target name="validate-xsl" description="Validates all XML files.">
         <xmlvalidate lenient="true">
             <fileset dir="." includes="*.xsl"/>
@@ -71,7 +102,7 @@
         <xmlvalidate lenient="false" warn="yes" file="ttaf1-dfxp.xml"/>
     </target>
 
-    <target name="validate" depends="validate-xsl,validate-svg,validate-tt-specs"/>
+    <target name="validate" depends="validate-xsl,validate-svg,validate-tt-specs,validate-schema-rnc,validate-profiles"/>
 
     <target name="updateAcks"
         description="Update acknowledgements. Before running this, 
--- a/spec/profiles/dfxp-presentation.xml	Fri May 08 14:48:00 2009 +0000
+++ b/spec/profiles/dfxp-presentation.xml	Fri May 08 15:06:41 2009 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- this file defines the "presentation" profile of ttaf1-dfxp -->
 <profile xmlns="http://www.w3.org/2006/10/ttaf1#parameter">
-<features base="http://www.w3.org/2006/10/ttaf1/feature"/>
+<features base="http://www.w3.org/2006/10/ttaf1/feature">
 <!-- required (mandatory) feature support -->
 <feature value="required">#color</feature>
 <feature value="required">#content</feature>
--- a/spec/profiles/dfxp-transformation.xml	Fri May 08 14:48:00 2009 +0000
+++ b/spec/profiles/dfxp-transformation.xml	Fri May 08 15:06:41 2009 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- this file defines the "dfxp-transformation" profile of ttaf1 -->
 <profile xmlns="http://www.w3.org/2006/10/ttaf1#parameter">
-<features base="http://www.w3.org/2006/10/ttaf1/feature"/>
+<features base="http://www.w3.org/2006/10/ttaf1/feature">
 <!-- required (mandatory) feature support -->
 <feature value="required">#core</feature>
 <feature value="required">#profile</feature>