- From: Arthur Ryman via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 29 Mar 2005 20:00:40 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite
In directory hutz:/tmp/cvs-serv31390
Modified Files:
build.xml
Log Message:
Completed service reference example for primer. There is still a minor problem in the definition of the restriction of ServiceType. The <endpoint> element isn't getting the WSDL namespace in the restriction.
Index: build.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml 26 Mar 2005 19:53:33 -0000 1.3
--- build.xml 29 Mar 2005 20:00:38 -0000 1.4
***************
*** 7,10 ****
--- 7,13 ----
ChangeLog:
+ 2005-03-28 Arthur Ryman ryman@ca.ibm.com
+ - Enable full schema checking.
+
2005-02-03 Arthur Ryman ryman@ca.ibm.com
- Implemented XML validation.
***************
*** 12,19 ****
<project name="WSDL20" default="main" basedir=".">
!
! <property name="xercesImpl.jar" location="E:\xerces-2_6_2\xercesImpl.jar"/>
! <property name="schemaLocation" value="http://www.w3.org/2004/08/wsdl xmlcatalog/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema xmlcatalog/xsd/XMLSchema.xsd"/>
!
<!--
The above schemaLocation property is intended to be used with the Xerces parser so that XML files do not
--- 15,23 ----
<project name="WSDL20" default="main" basedir=".">
!
! <property name="xercesImpl.jar" location="E:\xerces-2_6_2\xercesImpl.jar" />
! <property name="xercesSamples.jar" location="E:\xerces-2_6_2\xercesSamples.jar" />
! <property name="schemaLocation" value="http://www.w3.org/2004/08/wsdl xmlcatalog/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema xmlcatalog/xsd/XMLSchema.xsd" />
!
<!--
The above schemaLocation property is intended to be used with the Xerces parser so that XML files do not
***************
*** 25,43 ****
-->
!
<xmlcatalog id="schemas">
! <dtd publicId="-//W3C//DTD XMLSCHEMA 200102//EN" location="xmlcatalog/xsd/XMLSchema.dtd"/>
! <dtd publicId="datatypes" location="xmlcatalog/xsd/datatypes.dtd"/>
! <entity publicId="http://www.w3.org/2004/08/wsdl" location="xmlcatalog/wsdl/wsdl20.xsd"/>
! <entity publicId="http://www.w3.org/2001/XMLSchema" location="xmlcatalog/xsd/XMLSchema.xsd"/>
</xmlcatalog>
!
<xmlcatalog id="external">
<catalogpath>
! <fileset file="catalog.xml"/>
</catalogpath>
</xmlcatalog>
!
! <target name="main" depends="xsd-schema, wsdl-schema, good, bad" description="Validates all documents."/>
<target name="good" description="Validates good WSDL and XSD documents.">
--- 29,47 ----
-->
!
<xmlcatalog id="schemas">
! <dtd publicId="-//W3C//DTD XMLSCHEMA 200102//EN" location="xmlcatalog/xsd/XMLSchema.dtd" />
! <dtd publicId="datatypes" location="xmlcatalog/xsd/datatypes.dtd" />
! <entity publicId="http://www.w3.org/2004/08/wsdl" location="xmlcatalog/wsdl/wsdl20.xsd" />
! <entity publicId="http://www.w3.org/2001/XMLSchema" location="xmlcatalog/xsd/XMLSchema.xsd" />
</xmlcatalog>
!
<xmlcatalog id="external">
<catalogpath>
! <fileset file="catalog.xml" />
</catalogpath>
</xmlcatalog>
!
! <target name="main" depends="xsd-schema, wsdl-schema, good, bad" description="Validates all documents." />
<target name="good" description="Validates good WSDL and XSD documents.">
***************
*** 48,51 ****
--- 52,56 ----
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
+ <attribute name="http://apache.org/xml/features/validation/schema-full-checking" value="true" />
</xmlvalidate>
</target>
***************
*** 54,61 ****
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="documents/bad" includes="**/*.wsdl, **/*.xsd, **/*.xml" />
! <xmlcatalog refid="schemas"/>
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
</xmlvalidate>
</target>
--- 59,67 ----
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="documents/bad" includes="**/*.wsdl, **/*.xsd, **/*.xml" />
! <xmlcatalog refid="schemas" />
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
+ <attribute name="http://apache.org/xml/features/validation/schema-full-checking" value="true" />
</xmlvalidate>
</target>
***************
*** 64,71 ****
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="." includes="xmlcatalog/wsdl/*.xsd" />
! <xmlcatalog refid="schemas"/>
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
</xmlvalidate>
</target>
--- 70,78 ----
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="." includes="xmlcatalog/wsdl/*.xsd" />
! <xmlcatalog refid="schemas" />
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
+ <attribute name="http://apache.org/xml/features/validation/schema-full-checking" value="true" />
</xmlvalidate>
</target>
***************
*** 74,87 ****
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="." includes="xmlcatalog/xsd/*.xsd" />
! <xmlcatalog refid="schemas"/>
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
</xmlvalidate>
</target>
!
<target name="update-wsdl-ns" description="Updates the WSDL namespaces.">
<replace dir="documents" includes="**/*.wsdl" token="http://www.w3.org/@@@@/@@/wsdl" value="http://www.w3.org/2004/08/wsdl" />
</target>
</project>
\ No newline at end of file
--- 81,107 ----
<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
<fileset dir="." includes="xmlcatalog/xsd/*.xsd" />
! <xmlcatalog refid="schemas" />
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<attribute name="http://xml.org/sax/features/validation" value="true" />
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
+ <attribute name="http://apache.org/xml/features/validation/schema-full-checking" value="true" />
</xmlvalidate>
</target>
!
<target name="update-wsdl-ns" description="Updates the WSDL namespaces.">
<replace dir="documents" includes="**/*.wsdl" token="http://www.w3.org/@@@@/@@/wsdl" value="http://www.w3.org/2004/08/wsdl" />
</target>
+ <target name="xerces" description="Calls Xerces directly to validate files.">
+ <java classname="xni.XMLGrammarBuilder">
+ <classpath>
+ <pathelement location="${xercesImpl.jar}" />
+ <pathelement location="${xercesSamples.jar}" />
+ </classpath>
+ <arg value="-f"/>
+ <arg value="-a"/>
+ <arg file="documents/good/ServiceReference-1G/reservationDetails.xsd"/>
+ </java>
+ </target>
+
</project>
\ No newline at end of file
Received on Tuesday, 29 March 2005 20:00:41 UTC