ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1689262 - in /webservices/woden/trunk/java: ant-test/ etc/ant-test/ woden-ant/ woden-ant/downloads/
Date Sun, 05 Jul 2015 16:44:21 GMT
Author: veithen
Date: Sun Jul  5 16:44:20 2015
New Revision: 1689262

URL: http://svn.apache.org/r1689262
Log:
Restore the original ant-test directory and properly mavenize it. Kill the mavenization in
woden-ant. Reason:
- The files in woden-ant were copied from ant-test without preserving history.
- woden-ant/downloads contains ZIP files downloaded from the W3C. There is no license for
them, and it is not clear if we can include them. Note that they are likely not covered by
http://www.w3.org/Consortium/Legal/2008/04-testsuite-copyright.html because they have been
produced before 2004.

Added:
    webservices/woden/trunk/java/ant-test/
      - copied from r1689260, webservices/woden/trunk/java/etc/ant-test/
    webservices/woden/trunk/java/ant-test/pom.xml   (with props)
Removed:
    webservices/woden/trunk/java/etc/ant-test/
    webservices/woden/trunk/java/woden-ant/Interface.wsdl
    webservices/woden/trunk/java/woden-ant/W3Ctests.catalog
    webservices/woden/trunk/java/woden-ant/XSDImport.wsdl
    webservices/woden/trunk/java/woden-ant/XSDImport2.wsdl
    webservices/woden/trunk/java/woden-ant/build.xml
    webservices/woden/trunk/java/woden-ant/documents-bad-report.xml
    webservices/woden/trunk/java/woden-ant/documents-good-report.xml
    webservices/woden/trunk/java/woden-ant/downloads/
    webservices/woden/trunk/java/woden-ant/identify-test-case-roots.xsl
    webservices/woden/trunk/java/woden-ant/name.xsd
    webservices/woden/trunk/java/woden-ant/test-suite-results.zip
    webservices/woden/trunk/java/woden-ant/test.wsdl
    webservices/woden/trunk/java/woden-ant/validation-results-without-ids.xml
    webservices/woden/trunk/java/woden-ant/validation-results.xml
    webservices/woden/trunk/java/woden-ant/wsdl20-extensions.xsd
    webservices/woden/trunk/java/woden-ant/wsdl20-http.xsd
    webservices/woden/trunk/java/woden-ant/wsdl20-instance.xsd
    webservices/woden/trunk/java/woden-ant/wsdl20-rpc.xsd
    webservices/woden/trunk/java/woden-ant/wsdl20-soap.xsd
    webservices/woden/trunk/java/woden-ant/wsdl20.xsd
Modified:
    webservices/woden/trunk/java/ant-test/build.xml
    webservices/woden/trunk/java/woden-ant/pom.xml

Modified: webservices/woden/trunk/java/ant-test/build.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/ant-test/build.xml?rev=1689262&r1=1689260&r2=1689262&view=diff
==============================================================================
--- webservices/woden/trunk/java/ant-test/build.xml (original)
+++ webservices/woden/trunk/java/ant-test/build.xml Sun Jul  5 16:44:20 2015
@@ -37,32 +37,52 @@
 
 	<property name="woden.dir" location=".." />
 
-	<property file="${woden.dir}/build.properties" />
-    <property name="lib.dir" location="${woden.dir}/build/jar" />
-	<property name="downloads.lib.dir" location="${woden.dir}/downloads/lib" />
+    <property name="downloads" value="${build.dir}/downloads" />
+    <property name="W3cWsdl20URL" value="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/zips/test-suite.zip"
/>
+    <property name="W3cWsdl20File" value="test-suite.zip" />
+    <property name="w3cDir" value="${downloads}/w3c" />
+    <property name="W3cAssertsURL" value="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/zips/wsdl20.zip"
/>
+    <property name="W3cAssertsFile" value="wsdl20.zip" />
+    <property name="w3cAssertsDir" value="${downloads}/wsdl20" />
 	<property name="resources.dir" location="${woden.dir}/resources" />
     <property name="w3cTests.dir" location="${woden.dir}/../desc" />
 	<available file="${w3cTests.dir}" type="dir" property="w3cTestsDir.exists" />
 
-	<property name="test-suite.dir" location="${woden.dir}/downloads/w3c" />
+	<property name="test-suite.dir" location="${w3cDir}" />
 	<property name="interchange.dir" location="${test-suite.dir}/interchange" />
 	<property name="xmlcatalog.dir" location="${test-suite.dir}/xmlcatalog" />
-   
+    
+    <property name="W3CtestsCatalog" value="${woden.dir}/woden-tests/src/test/resources/org/apache/woden/resolver/resources/W3Ctests.catalog"
/>
+
+    <!-- Get the latest W3C WSDL 2.0 Test Cases and Schemas and unzip it -->
+    <target name="getW3cWsdl20" depends="getW3cWsdl20File, getW3cAssertsFile" description="-->
Gets the W3C Test Suite"/>
+    
+    <!-- W3C test suite zips -->
+    <available file="${downloads}/${W3cWsdl20File}" property="W3cWsdl20File.exists" />
+    <available file="${downloads}/${W3cAssertsFile}" property="W3cAssertsFile.exists"
/>
+
+    <target name="getW3cWsdl20File" unless="W3cWsdl20File.exists">
+        <mkdir dir="${w3cDir}" />
+        <get src="${W3cWsdl20URL}" dest="${downloads}/${W3cWsdl20File}" />
+
+        <unzip src="${downloads}/${W3cWsdl20File}" dest="${test-suite.dir}" />
+    </target>
+
+    <target name="getW3cAssertsFile" unless="W3cAssertsFile.exists">
+        <mkdir dir="${w3cAssertsDir}" />
+        <get src="${W3cAssertsURL}" dest="${downloads}/${W3cAssertsFile}" />
+
+        <unzip src="${downloads}/${W3cAssertsFile}" dest="${w3cAssertsDir}" />
+    </target>
+
 	<!-- ================================= 
           target: main              
          ================================= -->
-   <!-- The main, testDOM, testOM targets run the validatewsdl20 task with the classpath
appropriate for each 
-        implementation. The main target uses the default Woden implementation (i.e. DOM).
-->
    
-   <target name="main" description="---> Validate test suite, generates interchange
format, and validates results">
+   <target name="main" depends="getW3cWsdl20" description="---> Validate test suite,
generates interchange format, and validates results">
        <taskdef name="validatewsdl20" classname="org.apache.woden.ant.ValidateWSDL20">
            <classpath>
-               <fileset dir="${lib.dir}">
-                   <include name="*.jar" />
-               </fileset>
-               <fileset dir="${downloads.lib.dir}">
-                   <include name="*.jar" />
-               </fileset>
+               <pathelement path="${maven.test.classpath}" />
            </classpath>
        </taskdef>
        
@@ -71,68 +91,18 @@
        <antcall target="runTests" />
    </target>
 
-   <!-- Run the w3c tests against the Woden DOM implementation -->
-   <target name="testDOM" description="---> Validate test suite, generates interchange
format, and validates results for the DOM parser">
-       <taskdef name="validatewsdl20" classname="org.apache.woden.ant.ValidateWSDL20">
-           <classpath>
-               <fileset dir="${lib.dir}">
-                   <include name="${api.name}.jar" />
-                   <include name="${dom.name}.jar" />
-                   <include name="${ant.name}.jar" />
-               </fileset>
-               <fileset dir="${downloads.lib.dir}">
-                   <include name="${XercesJar1}" />
-                   <include name="${XercesJar2}" />
-                   <include name="ant-*.jar" />
-                   <include name="${XmlSchemaFile}" />
-               </fileset>
-           </classpath>
-       </taskdef>
-       
-       <property name="woden.implementation" value="org.apache.woden.internal.DOMWSDLFactory"
/>
-   
-       <antcall target="runTests" />
-   </target>
-   
-   <!-- Run the w3c tests against the Woden OM implementation -->
-   <target name="testOM" description="---> Validate test suite, generates interchange
format, and validates results for the OM parser">
-           <taskdef name="validatewsdl20" classname="org.apache.woden.ant.ValidateWSDL20">
-           <classpath>
-               <fileset dir="${lib.dir}">
-                   <include name="${api.name}.jar" />
-                   <include name="${om.name}.jar" />
-                   <include name="${ant.name}.jar" />
-               </fileset>
-               <fileset dir="${downloads.lib.dir}">
-                   <include name="${AxiomApiFile}" />
-                   <include name="${AxiomImplFile}" />
-                   <include name="${StaxFile}" />
-                   <include name="${WstxFile}" />
-                   <include name="${CommonsLoggingFile}" />
-                   <include name="ant-*.jar" />
-                   <include name="${XmlSchemaFile}" />
-               </fileset>
-           </classpath>
-       </taskdef>
-       
-       <property name="woden.implementation" value="org.apache.woden.internal.OMWSDLFactory"
/>
-   
-   
-       <antcall target="runTests" />
-   </target>
-   
    <target name="runTests" 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}" implName="${woden.implementation}"/>
-		<zip destfile="test-suite-results.zip" basedir="results" />
+       <validatewsdl20 dir="${test-suite.dir}/documents/good" includes="**/*.wsdl" cm="yes"
cmdir="results" report="${build.dir}/documents-good-report.xml" catalog="${W3CtestsCatalog}"
baseURI="${test-suite.dir}" implName="${woden.implementation}"/>
+		<zip destfile="${build.dir}/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}" implName="${woden.implementation}"/>
+	<target name="validation-results" description="--> Generates ${build.dir}/validation-results.xml
for all documents.">
+       <validatewsdl20 dir="${test-suite.dir}/documents" includes="**/*.wsdl" cm="no"
report="${build.dir}/validation-results-without-ids.xml" catalog="${W3CtestsCatalog}" baseURI="${test-suite.dir}"
implName="${woden.implementation}"/>
 		<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">
+		<xslt style="identify-test-case-roots.xsl" in="${build.dir}/validation-results-without-ids.xml"
out="${build.dir}/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"
/>
@@ -140,27 +110,28 @@
 		<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" />
+				<include name="${build.dir}/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}" implName="${woden.implementation}" />
+       <validatewsdl20 dir="${test-suite.dir}/messages/good" includes="**/*.wsdl" cm="yes"
cmdir="messages-results" report="messages-good-report.xml" catalog="${W3CtestsCatalog}" baseURI="${test-suite.dir}"
implName="${woden.implementation}" />
 		<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}"
implName="${woden.implementation}" />
+       <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="${W3CtestsCatalog}" baseURI="${test-suite.dir}" implName="${woden.implementation}"
/>
 	</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}" implName="${woden.implementation}" />
+       <validatewsdl20 dir="${test-suite.dir}/documents/bad" includes="**/*.wsdl" excludes="Binding-4B/Echo.wsdl"
cm="no" report="${build.dir}/documents-bad-report.xml" catalog="${W3CtestsCatalog}" baseURI="${test-suite.dir}"
implName="${woden.implementation}" />
 	</target>
 
 	<target name="schemavalidate-results" description="---> Validates component model
interchange format results againt schema.">
-		<schemavalidate failonerror="no">
+        <!-- TODO: this hangs -->
+		<!-- 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"
/>
@@ -171,14 +142,14 @@
 			<fileset dir="results">
 				<include name="**/*.wsdlcm" />
 			</fileset>
-		</schemavalidate>
+		</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" />
+				<include name="*-report.xml, ${build.dir}/validation-results.xml" />
 			</fileset>
 		</schemavalidate>
 	</target>
@@ -217,8 +188,8 @@
        <!-- copy Woden results to the W3C WSDL2 project-->
        <copy todir="${w3cTests.dir}/test-suite/results/downloads/Woden" overwrite="true">
            <fileset dir="${basedir}">
-               <include name="test-suite-results.zip" />
-               <include name="validation-results.xml" />
+               <include name="${build.dir}/test-suite-results.zip" />
+               <include name="${build.dir}/validation-results.xml" />
            </fileset>
        </copy>
    	
@@ -232,7 +203,7 @@
    	
        <copy todir="${w3cTests.dir}/test-suite/results/Woden" overwrite="true">
            <fileset dir="${w3cTests.dir}/test-suite/results/downloads/Woden">
-               <include name="validation-results.xml" />
+               <include name="${build.dir}/validation-results.xml" />
            </fileset>
        </copy>
        

Added: webservices/woden/trunk/java/ant-test/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/ant-test/pom.xml?rev=1689262&view=auto
==============================================================================
--- webservices/woden/trunk/java/ant-test/pom.xml (added)
+++ webservices/woden/trunk/java/ant-test/pom.xml Sun Jul  5 16:44:20 2015
@@ -0,0 +1,76 @@
+<?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.
+ !-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.woden</groupId>
+        <artifactId>woden</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ant-test</artifactId>
+    <name>Woden - W3C tests</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>woden-ant</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <configuration>
+                            <target>
+                                <property name="build.dir" value="${project.build.directory}"
/>
+                                <property name="maven.test.classpath" refid="maven.test.classpath"
/>
+                                <ant antfile="${basedir}/build.xml"> 
+                                    <target name="main" />
+                                </ant>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>${apache.ant.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.ant</groupId>
+                        <artifactId>ant-nodeps</artifactId>
+                        <version>${apache.ant.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Propchange: webservices/woden/trunk/java/ant-test/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/woden/trunk/java/woden-ant/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/woden-ant/pom.xml?rev=1689262&r1=1689261&r2=1689262&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-ant/pom.xml (original)
+++ webservices/woden/trunk/java/woden-ant/pom.xml Sun Jul  5 16:44:20 2015
@@ -58,53 +58,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <!--  to run W3C testsuite and results are compared to W3C baseline -->
-            <id>interop</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.3</version>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <configuration>
-                                    <tasks>
-                                        <property name="compile_classpath" refid="maven.compile.classpath"
/>
-                                        <property name="runtime_classpath" refid="maven.runtime.classpath"
/>
-                                        <property name="test_classpath" refid="maven.test.classpath"
/>
-                                        <ant antfile="${basedir}/build.xml"> 
-                                            <target name="getW3cWsdl20" />
-                                            <target name="main" />
-                                        </ant>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.ant</groupId>
-                                <artifactId>ant-trax</artifactId>
-                                <version>${apache.ant.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.ant</groupId>
-                                <artifactId>ant-nodeps</artifactId>
-                                <version>${apache.ant.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.ant</groupId>



Mime
View raw message