Author: jharting Date: 2009-02-18 09:03:11 -0500 (Wed, 18 Feb 2009) New Revision: 10054 Modified: trunk/build.xml trunk/build/validate.xml Log: JBSEAM-3751 Modified: trunk/build/validate.xml =================================================================== --- trunk/build/validate.xml 2009-02-17 16:03:42 UTC (rev 10053) +++ trunk/build/validate.xml 2009-02-18 14:03:11 UTC (rev 10054) @@ -23,6 +23,8 @@ http://jboss.com/products/seam/theme ${src.schema.dir}/theme-${schema.version}.xsd http://jboss.com/products/seam/transaction ${src.schema.dir}/transaction-${schema.version}.xsd http://jboss.com/products/seam/web ${src.schema.dir}/web-${schema.version}.xsd " /> + + <property name="xsdLocation" value="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd" /> <taskdef name="xmlvalidate.task" classname="org.apache.tools.ant.taskdefs.optional.XMLValidateTask"> <classpath> @@ -46,19 +48,29 @@ <include name="**/*.jpdl.xml" /> <exclude name="**/.gpd.*.jpdl.xml" /> </fileset> + + <fileset id="validate.schemas" dir="${seam.dir}"> + <include name="src/**/*.xsd" /> + </fileset> <target name="validateConfiguration" description="Validate XML Configuration Files"> <validateConfiguration> <fileset refid="validate.resources" /> </validateConfiguration> </target> + + <target name="validatexsd" description="Validate all XML Schemas"> + <validateConfiguration> + <fileset refid="validate.schemas" /> + </validateConfiguration> + </target> <presetdef name="validateConfiguration" > <xmlvalidate.task classname="org.apache.xerces.jaxp.SAXParserImpl$JAXPSAXParser"> <attribute name="http://xml.org/sax/features/validation" value="true" /> <attribute name="http://apache.org/xml/features/validation/schema" value="true" /> <attribute name="http://xml.org/sax/features/namespaces" value="true" /> - <property name="http://apache.org/xml/properties/schema/external-schemaLocatio... value="${seam.schemaLocations}" /> + <property name="http://apache.org/xml/properties/schema/external-schemaLocatio... value="${seam.schemaLocations} ${xsdLocation}" /> <xmlcatalog> <dtd publicId="-//JBoss/Seam Component Configuration DTD 2.0//EN" location="${src.schema.dir}/components-${schema.version}.dtd" /> <dtd publicId="-//JBoss/Seam Pages Configuration DTD 2.0//EN" location="${src.schema.dir}/pages-${schema.version}.dtd" /> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-02-17 16:03:42 UTC (rev 10053) +++ trunk/build.xml 2009-02-18 14:03:11 UTC (rev 10054) @@ -526,6 +526,7 @@ <target name="testall" depends="test,build,copylib,testexamples" description="Run the core unit tests and all example tests"/> <target name="validateall" description="Validate all example XML Configuration Files"> + <ant antfile="${seam.dir}/build/validate.xml" target="validatexsd"/> <ant dir="examples/booking" target="validateConfiguration" inheritall="false" /> <ant dir="examples/blog" target="validateConfiguration" inheritall="false" /> <ant dir="examples/contactlist" target="validateConfiguration" inheritall="false" />