W3C home > Mailing lists > Public > public-ws-desc-eds@w3.org > February 2005

2002/ws/desc/test-suite build.xml,1.1,1.2 catalog.xml,1.1,1.2

From: Arthur Ryman <aryman@dev.w3.org>
Date: Thu, 03 Feb 2005 18:46:34 +0000
To: public-ws-desc-eds@w3.org
Message-ID: <E1Cwlzv-0008Ep-08@lionel-hutz.w3.org>

Update of /sources/public/2002/ws/desc/test-suite
In directory hutz:/tmp/cvs-serv31592

Modified Files:
	build.xml catalog.xml 
Log Message:
Added test cases and Ant script to performan XML schema validation.

Index: catalog.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/catalog.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** catalog.xml	3 Feb 2005 14:36:52 -0000	1.1
--- catalog.xml	3 Feb 2005 18:46:32 -0000	1.2
***************
*** 8,13 ****
  		uri="xmlcatalog/xsd/XMLSchema.dtd" />
  	<dtd publicId="datatypes" uri="xmlcatalog/xsd/datatypes.dtd" />
! 	<uri name="http://www.w3.org/@@@@/@@/wsdl"
  		uri="xmlcatalog/wsdl/wsdl20.xsd" />
  	<uri name="http://www.w3.org/2001/XMLSchema"
  		uri="xmlcatalog/xsd/XMLSchema.xsd" />
--- 8,17 ----
  		uri="xmlcatalog/xsd/XMLSchema.dtd" />
  	<dtd publicId="datatypes" uri="xmlcatalog/xsd/datatypes.dtd" />
! 	<uri name="http://www.w3.org/2004/08/wsdl"
  		uri="xmlcatalog/wsdl/wsdl20.xsd" />
+ 	<uri name="http://www.w3.org/2004/08/wsdl/rpc"
+ 		uri="xmlcatalog/wsdl/wsdl20-rpc.xsd" />
+ 	<uri name="http://www.w3.org/2004/08/wsdl"
+ 		uri="xmlcatalog/wsdl/wsdl20-soap.xsd/soap" />
  	<uri name="http://www.w3.org/2001/XMLSchema"
  		uri="xmlcatalog/xsd/XMLSchema.xsd" />

Index: build.xml
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	3 Feb 2005 14:36:52 -0000	1.1
--- build.xml	3 Feb 2005 18:46:32 -0000	1.2
***************
*** 1,12 ****
  <?xml version="1.0" encoding="UTF-8"?>
  <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/@@@@/@@/wsdl xmlcatalog/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema xmlcatalog/xsd/XMLSchema.xsd"/>
  	
  	<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/@@@@/@@/wsdl" location="xmlcatalog/wsdl/wsdl20.xsd"/>
  		<entity publicId="http://www.w3.org/2001/XMLSchema" location="xmlcatalog/xsd/XMLSchema.xsd"/>
  	</xmlcatalog>
--- 1,33 ----
  <?xml version="1.0" encoding="UTF-8"?>
+ 
+ <!--
+ 
+ 	This Ant script validates the W3C WSDL 2.0 Test Suite.
+ 	
+ 	ChangeLog:
+ 	
+ 	2005-02-03 Arthur Ryman ryman@ca.ibm.com
+ 	- Implemented XML validation. 
+ -->
+ 
  <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
! 		have to include an schemaLocation attribute. Unfortunately, there is a bug in the Xerces 2.6.2 that prevents
! 		the use of this property. I hope a future version of Xerces will fix this bug so that we can have simpler
! 		XML documents.
! 		
! 		<attribute name="http://apache.org/xml/properties/schema/external-schemaLocation" value="${schemaLocation}"/>
! 	
! 	-->
  	
  	<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>
***************
*** 18,27 ****
  	</xmlcatalog>
  	
! 	<target name="main" depends="valid, invalid" description="Validates all documents."/>
  
! 	<target name="valid" description="Validates valid WSDL and XSD documents.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
! 			<fileset dir="." includes="valid/**/*.wsdl, valid/**/*.xsd" />
! 			<xmlcatalog refid="external" />
  			<attribute name="http://xml.org/sax/features/namespaces" value="true" />
  			<attribute name="http://xml.org/sax/features/validation" value="true" />
--- 39,48 ----
  	</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.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
! 			<fileset dir="documents/good" includes="**/*.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" />
***************
*** 30,45 ****
  	</target>
  
! 	<target name="invalid" description="Validates invalid WSDL and XSD documents.">
  		<xmlvalidate failonerror="no" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
! 			<fileset dir="." includes="invalid/**/*.wsdl, invalid/**/*.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/properties/schema/external-schemaLocation" value="${schemaLocation}"/>
  		</xmlvalidate>
  	</target>
  
! 	<target name="wsdl" description="Validates WSDL schemas.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
  			<fileset dir="." includes="xmlcatalog/wsdl/*.xsd" />
--- 51,65 ----
  	</target>
  
! 	<target name="bad" description="Validates bad WSDL and XSD documents.">
  		<xmlvalidate failonerror="no" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
! 			<fileset dir="documents/bad" includes="**/*.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>
  
! 	<target name="wsdl-schema" description="Validates WSDL schemas.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
  			<fileset dir="." includes="xmlcatalog/wsdl/*.xsd" />
***************
*** 51,55 ****
  	</target>
  
! 	<target name="xsd" description="Validates XSD schema.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
  			<fileset dir="." includes="xmlcatalog/xsd/*.xsd" />
--- 71,75 ----
  	</target>
  
! 	<target name="xsd-schema" description="Validates XSD schema.">
  		<xmlvalidate failonerror="yes" lenient="no" warn="yes" classname="org.apache.xerces.parsers.SAXParser" classpath="${xercesImpl.jar}">
  			<fileset dir="." includes="xmlcatalog/xsd/*.xsd" />
***************
*** 60,64 ****
  		</xmlvalidate>
  	</target>
! 
  
  </project>
\ No newline at end of file
--- 80,87 ----
  		</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
Received on Thursday, 3 February 2005 18:46:35 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 19:31:29 UTC