Author: jkaputin
Date: Thu Aug 23 04:31:40 2007
New Revision: 568939
URL: http://svn.apache.org/viewvc?rev=568939&view=rev
Log:
WODEN-166
corrected some files with mixed eol content and
ran command 'svn propset -R svn:eol-style native *'
Modified:
incubator/woden/trunk/java/ant-test/Interface.wsdl (contents, props
changed)
incubator/woden/trunk/java/ant-test/XSDImport.wsdl (contents, props
changed)
incubator/woden/trunk/java/ant-test/XSDImport2.wsdl (contents, props
changed)
incubator/woden/trunk/java/ant-test/build.xml (contents, props changed)
incubator/woden/trunk/java/ant-test/documents-bad-report.xml (contents,
props changed)
incubator/woden/trunk/java/ant-test/documents-good-report.xml (contents,
props changed)
incubator/woden/trunk/java/ant-test/identify-test-case-roots.xsl
(contents, props changed)
incubator/woden/trunk/java/ant-test/name.xsd (contents, props changed)
incubator/woden/trunk/java/ant-test/test.wsdl (contents, props changed)
incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml
(contents, props changed)
incubator/woden/trunk/java/ant-test/validation-results.xml (contents,
props changed)
incubator/woden/trunk/java/ant-test/wsdl20-extensions.xsd (contents,
props changed)
incubator/woden/trunk/java/ant-test/wsdl20-http.xsd (contents, props
changed)
incubator/woden/trunk/java/ant-test/wsdl20-instance.xsd (contents, props
changed)
incubator/woden/trunk/java/ant-test/wsdl20-rpc.xsd (contents, props
changed)
incubator/woden/trunk/java/ant-test/wsdl20-soap.xsd (contents, props
changed)
incubator/woden/trunk/java/ant-test/wsdl20.xsd (contents, props changed)
incubator/woden/trunk/java/eclipseplugin/META-INF/MANIFEST.MF (contents,
props changed)
incubator/woden/trunk/java/eclipseplugin/plugin.properties (contents,
props changed)
incubator/woden/trunk/java/resources/schema.catalog (contents, props
changed)
incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Utils.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingFaultReferencePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingMessageReferencePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingOperationPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/BindingPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ComponentPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/DescriptionPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ElementDeclarationPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/EndpointPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ExtensionsPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/FragmentIdentifier.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceFaultReferencePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceMessageReferencePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfaceOperationPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/InterfacePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/ServicePart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/TypeDefinitionPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/fragids/about-this-package
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/xpointer/PointerPart.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/xpointer/XPointer.java
(contents, props changed)
incubator/woden/trunk/java/src/org/apache/woden/xpointer/XmlnsPart.java
(contents, props changed)
Modified: incubator/woden/trunk/java/ant-test/Interface.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/Interface.wsdl?rev=568939&r1=568938&r2=568939&view=diff
==============================================================================
--- incubator/woden/trunk/java/ant-test/Interface.wsdl (original)
+++ incubator/woden/trunk/java/ant-test/Interface.wsdl Thu Aug 23 04:31:40 2007
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one or more
- ! contributor license agreements. See the NOTICE file distributed with
- ! this work for additional information regarding copyright ownership.
- ! The ASF licenses this file to You under the Apache License, Version 2.0
- ! (the "License"); you may not use this file except in compliance with
- ! the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing, software
- ! distributed under the License is distributed on an "AS IS" BASIS,
- ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ! See the License for the specific language governing permissions and
- ! limitations under the License.
- !-->
-<wsdl:description targetNamespace="http://example.org/";
- xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.w3.org/2006/01/wsdl wsdl20.xsd">
-
- <wsdl:documentation>
- This test shows a valid use of a WSDL 2.0 interface.
- </wsdl:documentation>
-
- <wsdl:interface name="myInterface"></wsdl:interface>
-</wsdl:description>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one or more
+ ! contributor license agreements. See the NOTICE file distributed with
+ ! this work for additional information regarding copyright ownership.
+ ! The ASF licenses this file to You under the Apache License, Version 2.0
+ ! (the "License"); you may not use this file except in compliance with
+ ! the License. You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<wsdl:description targetNamespace="http://example.org/";
+ xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.w3.org/2006/01/wsdl wsdl20.xsd">
+
+ <wsdl:documentation>
+ This test shows a valid use of a WSDL 2.0 interface.
+ </wsdl:documentation>
+
+ <wsdl:interface name="myInterface"></wsdl:interface>
+</wsdl:description>
Propchange: incubator/woden/trunk/java/ant-test/Interface.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/woden/trunk/java/ant-test/XSDImport.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/XSDImport.wsdl?rev=568939&r1=568938&r2=568939&view=diff
==============================================================================
--- incubator/woden/trunk/java/ant-test/XSDImport.wsdl (original)
+++ incubator/woden/trunk/java/ant-test/XSDImport.wsdl Thu Aug 23 04:31:40 2007
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:description targetNamespace="http://example.org/XSDImport";
- xmlns:name="http://example.org/name";
- xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.w3.org/2006/01/wsdl
-http://www.w3.org/2006/01/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema
-http://www.w3.org/2001/XMLSchema.xsd";>
-
- <wsdl:documentation>
- This test shows a valid use of an XML schema import.
- </wsdl:documentation>
-
- <wsdl:types>
- <xs:import schemaLocation="name.xsd"
- namespace="http://example.org/name"; />
- </wsdl:types>
-
- <wsdl:interface name="Names">
- <wsdl:operation name="getNameFromSIN"
- pattern="http://www.w3.org/2006/01/wsdl/in-out";>
- <wsdl:input element="name:SIN" />
- <wsdl:output element="name:Name" />
- </wsdl:operation>
- </wsdl:interface>
-</wsdl:description>
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:description targetNamespace="http://example.org/XSDImport";
+ xmlns:name="http://example.org/name";
+ xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.w3.org/2006/01/wsdl
+http://www.w3.org/2006/01/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema
+http://www.w3.org/2001/XMLSchema.xsd";>
+
+ <wsdl:documentation>
+ This test shows a valid use of an XML schema import.
+ </wsdl:documentation>
+
+ <wsdl:types>
+ <xs:import schemaLocation="name.xsd"
+ namespace="http://example.org/name"; />
+ </wsdl:types>
+
+ <wsdl:interface name="Names">
+ <wsdl:operation name="getNameFromSIN"
+ pattern="http://www.w3.org/2006/01/wsdl/in-out";>
+ <wsdl:input element="name:SIN" />
+ <wsdl:output element="name:Name" />
+ </wsdl:operation>
+ </wsdl:interface>
+</wsdl:description>
Propchange: incubator/woden/trunk/java/ant-test/XSDImport.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/woden/trunk/java/ant-test/XSDImport2.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/XSDImport2.wsdl?rev=568939&r1=568938&r2=568939&view=diff
==============================================================================
--- incubator/woden/trunk/java/ant-test/XSDImport2.wsdl (original)
+++ incubator/woden/trunk/java/ant-test/XSDImport2.wsdl Thu Aug 23 04:31:40 2007
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:description targetNamespace="http://example.org/XSDImport";
- xmlns:name="http://example.org/name";
- xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.w3.org/2006/01/wsdl
-http://www.w3.org/2006/01/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema
-http://www.w3.org/2001/XMLSchema.xsd";>
-
- <wsdl:documentation>
- This test shows that the XML schema import is valid when it is
- imported in both this document and the document this imports.
- </wsdl:documentation>
-
- <wsdl:include location="XSDImport.wsdl" />
-
- <wsdl:types>
- <xs:import schemaLocation="name.xsd"
- namespace="http://example.org/name"; />
- </wsdl:types>
-
- <wsdl:interface name="Names">
- <wsdl:operation name="getNameFromSIN"
- pattern="http://www.w3.org/2006/01/wsdl/in-out";>
- <wsdl:input element="name:SIN" />
- <wsdl:output element="name:Name" />
- </wsdl:operation>
- </wsdl:interface>
-</wsdl:description>
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:description targetNamespace="http://example.org/XSDImport";
+ xmlns:name="http://example.org/name";
+ xmlns:wsdl="http://www.w3.org/2006/01/wsdl";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.w3.org/2006/01/wsdl
+http://www.w3.org/2006/01/wsdl/wsdl20.xsd http://www.w3.org/2001/XMLSchema
+http://www.w3.org/2001/XMLSchema.xsd";>
+
+ <wsdl:documentation>
+ This test shows that the XML schema import is valid when it is
+ imported in both this document and the document this imports.
+ </wsdl:documentation>
+
+ <wsdl:include location="XSDImport.wsdl" />
+
+ <wsdl:types>
+ <xs:import schemaLocation="name.xsd"
+ namespace="http://example.org/name"; />
+ </wsdl:types>
+
+ <wsdl:interface name="Names">
+ <wsdl:operation name="getNameFromSIN"
+ pattern="http://www.w3.org/2006/01/wsdl/in-out";>
+ <wsdl:input element="name:SIN" />
+ <wsdl:output element="name:Name" />
+ </wsdl:operation>
+ </wsdl:interface>
+</wsdl:description>
Propchange: incubator/woden/trunk/java/ant-test/XSDImport2.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/woden/trunk/java/ant-test/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/build.xml?rev=568939&r1=568938&r2=568939&view=diff
==============================================================================
--- incubator/woden/trunk/java/ant-test/build.xml (original)
+++ incubator/woden/trunk/java/ant-test/build.xml Thu Aug 23 04:31:40 2007
@@ -1,133 +1,133 @@
-<?xml version="1.0"?>
-<!--
- ! Licensed to the Apache Software Foundation (ASF) under one or more
- ! contributor license agreements. See the NOTICE file distributed with
- ! this work for additional information regarding copyright ownership.
- ! The ASF licenses this file to You under the Apache License, Version 2.0
- ! (the "License"); you may not use this file except in compliance with
- ! the License. You may obtain a copy of the License at
- !
- ! http://www.apache.org/licenses/LICENSE-2.0
- !
- ! Unless required by applicable law or agreed to in writing, software
- ! distributed under the License is distributed on an "AS IS" BASIS,
- ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ! See the License for the specific language governing permissions and
- ! limitations under the License.
- !-->
-<!--
-
- This Ant script tests Woden against the W3C WSDL 2.0 Test Suite.
-
- ChangeLog:
-
- 2006-11-11 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
- - use w3c directory to get test cases and schemas
-
- 2006-05-18 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
- - added schema validation of results
-
- 2006-05-19 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
- - updated script so that Woden is a sibling project of W3C desc in the
workspace.
-
- 2006-06-11 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
- - added report output and targets to run on good and bad documents
--->
-<project default="main" basedir=".">
-
+<?xml version="1.0"?>
+<!--
+ ! Licensed to the Apache Software Foundation (ASF) under one or more
+ ! contributor license agreements. See the NOTICE file distributed with
+ ! this work for additional information regarding copyright ownership.
+ ! The ASF licenses this file to You under the Apache License, Version 2.0
+ ! (the "License"); you may not use this file except in compliance with
+ ! the License. You may obtain a copy of the License at
+ !
+ ! http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<!--
+
+ This Ant script tests Woden against the W3C WSDL 2.0 Test Suite.
+
+ ChangeLog:
+
+ 2006-11-11 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
+ - use w3c directory to get test cases and schemas
+
+ 2006-05-18 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
+ - added schema validation of results
+
+ 2006-05-19 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
+ - updated script so that Woden is a sibling project of W3C desc in the
workspace.
+
+ 2006-06-11 Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
+ - added report output and targets to run on good and bad documents
+-->
+<project default="main" basedir=".">
+
<property name="woden.dir" location=".." />
-
- <property file="${woden.dir}/build.properties" />
- <property name="lib.dir" location="${woden.dir}/build" />
- <property name="downloads.lib.dir"
location="${woden.dir}/downloads/lib" />
- <property name="resources.dir" location="${woden.dir}/resources" />
-
- <property name="test-suite.dir" location="${woden.dir}/downloads/w3c" />
- <property name="interchange.dir"
location="${test-suite.dir}/interchange" />
+
+ <property file="${woden.dir}/build.properties" />
+ <property name="lib.dir" location="${woden.dir}/build" />
+ <property name="downloads.lib.dir"
location="${woden.dir}/downloads/lib" />
+ <property name="resources.dir" location="${woden.dir}/resources" />
+
+ <property name="test-suite.dir" location="${woden.dir}/downloads/w3c" />
+ <property name="interchange.dir"
location="${test-suite.dir}/interchange" />
<property name="xmlcatalog.dir" location="${test-suite.dir}/xmlcatalog"
/>
- <taskdef name="validatewsdl20"
classname="org.apache.woden.ant.ValidateWSDL20"
classpath="${resources.dir};${lib.dir}/woden-1.0-incubating-M8.jar;${lib.dir}/woden-ant-1.0-incubating-M8.jar;${downloads.lib.dir}/${XmlSchemaFile};${downloads.lib.dir}/${XercesJar1};${downloads.lib.dir}/${XercesJar2}"
/>
-
- <target name="main" description="---> Validate test suite, generates
interchange format, and validates results" depends="validation-results,
documents-good, documents-bad, schemavalidate-results" />
-
- <target name="documents-good" description="---> Validates W3C WSDL 2.0
good document test suite and outputs component model">
- <mkdir dir="results" />
- <validatewsdl20 dir="${test-suite.dir}/documents/good"
includes="**/*.wsdl" cm="yes" cmdir="results"
report="documents-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}"/>
- <zip destfile="test-suite-results.zip" basedir="results" />
- </target>
-
- <target name="validation-results" description="--> Generates
validation-results.xml for all documents.">
- <validatewsdl20 dir="${test-suite.dir}/documents"
includes="**/*.wsdl" cm="no" report="validation-results-without-ids.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}"/>
- <property name="test-suite-xml"
location="${test-suite.dir}/test-suite.xml" />
- <xslt style="identify-test-case-roots.xsl"
in="validation-results-without-ids.xml" out="validation-results.xml"
force="yes">
- <param name="test-suite-dir"
expression="${test-suite.dir}" />
- <param name="test-suite-xml"
expression="${test-suite-xml}" />
- <param name="Identifier-base"
expression="http://dev.w3.org/cvsweb/2002/ws/desc/test-suite"; />
- </xslt>
- <schemavalidate failonerror="no">
- <schema
namespace="http://www.w3.org/2006/06/wsdl/ValidationReport";
file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
- <fileset dir=".">
- <include name="validation-results.xml" />
- </fileset>
- </schemavalidate>
- </target>
-
- <target name="messages-good" description="---> Validates W3C WSDL 2.0
good message test suite and outputs component model">
- <mkdir dir="messages-results" />
- <validatewsdl20 dir="${test-suite.dir}/messages/good"
includes="**/*.wsdl" cm="yes" cmdir="messages-results"
report="messages-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
- <zip destfile="test-suite-messages-results.zip"
basedir="messages-results" />
- </target>
-
- <target name="messages-good-in-place" description="---> Validates W3C
WSDL 2.0 good message test suite and outputs component model in place">
- <validatewsdl20 dir="${test-suite.dir}/messages/good"
includes="**/*.wsdl" cm="yes" cmdir="${test-suite.dir}/messages/good"
report="${test-suite.dir}/messages/good/messages-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
- </target>
-
- <target name="documents-bad" description="---> Validates W3C WSDL 2.0
bad document test suite and outputs report">
- <validatewsdl20 dir="${test-suite.dir}/documents/bad"
includes="**/*.wsdl" excludes="Binding-4B/Echo.wsdl" cm="no"
report="documents-bad-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
- </target>
-
- <target name="schemavalidate-results" description="---> Validates
component model interchange format results againt schema.">
- <schemavalidate failonerror="no">
- <schema
namespace="http://www.w3.org/XML/1998/namespace";
file="${interchange.dir}/xml.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component";
file="${interchange.dir}/wsdlcm.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-base";
file="${interchange.dir}/wsdlcm-base.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-extensions";
file="${interchange.dir}/wsdlcm-extensions.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http";
file="${interchange.dir}/wsdlcm-http.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-rpc";
file="${interchange.dir}/wsdlcm-rpc.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap";
file="${interchange.dir}/wsdlcm-soap.xsd" />
- <fileset dir="results">
- <include name="**/*.wsdlcm" />
- </fileset>
- </schemavalidate>
- </target>
-
- <target name="schemavalidate-validation-reports">
- <schemavalidate failonerror="no">
- <schema
namespace="http://www.w3.org/2006/06/wsdl/ValidationReport";
file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
- <fileset dir=".">
- <include name="*-report.xml,
validation-results.xml" />
- </fileset>
- </schemavalidate>
- </target>
-
+ <taskdef name="validatewsdl20"
classname="org.apache.woden.ant.ValidateWSDL20"
classpath="${resources.dir};${lib.dir}/woden-1.0-incubating-M8.jar;${lib.dir}/woden-ant-1.0-incubating-M8.jar;${downloads.lib.dir}/${XmlSchemaFile};${downloads.lib.dir}/${XercesJar1};${downloads.lib.dir}/${XercesJar2}"
/>
+
+ <target name="main" description="---> Validate test suite, generates
interchange format, and validates results" depends="validation-results,
documents-good, documents-bad, schemavalidate-results" />
+
+ <target name="documents-good" description="---> Validates W3C WSDL 2.0
good document test suite and outputs component model">
+ <mkdir dir="results" />
+ <validatewsdl20 dir="${test-suite.dir}/documents/good"
includes="**/*.wsdl" cm="yes" cmdir="results"
report="documents-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}"/>
+ <zip destfile="test-suite-results.zip" basedir="results" />
+ </target>
+
+ <target name="validation-results" description="--> Generates
validation-results.xml for all documents.">
+ <validatewsdl20 dir="${test-suite.dir}/documents"
includes="**/*.wsdl" cm="no" report="validation-results-without-ids.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}"/>
+ <property name="test-suite-xml"
location="${test-suite.dir}/test-suite.xml" />
+ <xslt style="identify-test-case-roots.xsl"
in="validation-results-without-ids.xml" out="validation-results.xml"
force="yes">
+ <param name="test-suite-dir"
expression="${test-suite.dir}" />
+ <param name="test-suite-xml"
expression="${test-suite-xml}" />
+ <param name="Identifier-base"
expression="http://dev.w3.org/cvsweb/2002/ws/desc/test-suite"; />
+ </xslt>
+ <schemavalidate failonerror="no">
+ <schema
namespace="http://www.w3.org/2006/06/wsdl/ValidationReport";
file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
+ <fileset dir=".">
+ <include name="validation-results.xml" />
+ </fileset>
+ </schemavalidate>
+ </target>
+
+ <target name="messages-good" description="---> Validates W3C WSDL 2.0
good message test suite and outputs component model">
+ <mkdir dir="messages-results" />
+ <validatewsdl20 dir="${test-suite.dir}/messages/good"
includes="**/*.wsdl" cm="yes" cmdir="messages-results"
report="messages-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
+ <zip destfile="test-suite-messages-results.zip"
basedir="messages-results" />
+ </target>
+
+ <target name="messages-good-in-place" description="---> Validates W3C
WSDL 2.0 good message test suite and outputs component model in place">
+ <validatewsdl20 dir="${test-suite.dir}/messages/good"
includes="**/*.wsdl" cm="yes" cmdir="${test-suite.dir}/messages/good"
report="${test-suite.dir}/messages/good/messages-good-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
+ </target>
+
+ <target name="documents-bad" description="---> Validates W3C WSDL 2.0
bad document test suite and outputs report">
+ <validatewsdl20 dir="${test-suite.dir}/documents/bad"
includes="**/*.wsdl" excludes="Binding-4B/Echo.wsdl" cm="no"
report="documents-bad-report.xml"
catalog="${woden.dir}/test/org/apache/woden/resolver/resources/W3Ctests.catalog"
baseURI="${test-suite.dir}" />
+ </target>
+
+ <target name="schemavalidate-results" description="---> Validates
component model interchange format results againt schema.">
+ <schemavalidate failonerror="no">
+ <schema
namespace="http://www.w3.org/XML/1998/namespace";
file="${interchange.dir}/xml.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component";
file="${interchange.dir}/wsdlcm.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-base";
file="${interchange.dir}/wsdlcm-base.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-extensions";
file="${interchange.dir}/wsdlcm-extensions.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http";
file="${interchange.dir}/wsdlcm-http.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-rpc";
file="${interchange.dir}/wsdlcm-rpc.xsd" />
+ <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap";
file="${interchange.dir}/wsdlcm-soap.xsd" />
+ <fileset dir="results">
+ <include name="**/*.wsdlcm" />
+ </fileset>
+ </schemavalidate>
+ </target>
+
+ <target name="schemavalidate-validation-reports">
+ <schemavalidate failonerror="no">
+ <schema
namespace="http://www.w3.org/2006/06/wsdl/ValidationReport";
file="${xmlcatalog.dir}/wsdl/ValidationReport.xsd" />
+ <fileset dir=".">
+ <include name="*-report.xml,
validation-results.xml" />
+ </fileset>
+ </schemavalidate>
+ </target>
+
<!-- =================================
target: canonicalize-results
================================= -->
<target name="canonicalize-results" description="--> Canonicalizes
component interchange format results">
- <xslt
style="${test-suite.dir}/results/canonicalize-wsdlcm.xslt"
includes="**/*.wsdlcm" extension=".wsdlcm1" destdir="." />
+ <xslt
style="${test-suite.dir}/results/canonicalize-wsdlcm.xslt"
includes="**/*.wsdlcm" extension=".wsdlcm1" destdir="." />
<xslt
style="${test-suite.dir}/results/canonicalize-id-wsdlcm.xslt"
includes="**/*.wsdlcm1" extension=".wsdlcm2" destdir="." />
- </target>
-
- <target name="compare">
- <xslt style="${test-suite.dir}/results/compare-wsdlcm.xslt"
in="results/Chameleon-1G/getBalance.wsdlcm2"
out="results/Chameleon-1G/getBalance-results.xml">
- <param name="aspirant"
expression="results/Chameleon-1G/getBalance.wsdlcm2" />
- <param name="archetype"
expression="results-old/Chameleon-1G/getBalance.wsdlcm2" />
- </xslt>
-
</target>
+ <target name="compare">
+ <xslt style="${test-suite.dir}/results/compare-wsdlcm.xslt"
in="results/Chameleon-1G/getBalance.wsdlcm2"
out="results/Chameleon-1G/getBalance-results.xml">
+ <param name="aspirant"
expression="results/Chameleon-1G/getBalance.wsdlcm2" />
+ <param name="archetype"
expression="results-old/Chameleon-1G/getBalance.wsdlcm2" />
+ </xslt>
+
+ </target>
+
+
-
</project>
Propchange: incubator/woden/trunk/java/ant-test/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
