Author: ryman
Date: Sat Nov 11 13:08:26 2006
New Revision: 473798
URL: http://svn.apache.org/viewvc?view=rev&rev=473798
Log:
[WODEN-38] Added target to download W3C test case and schemas to downloads
directory.
Modified:
incubator/woden/trunk/java/ant-test/ (props changed)
incubator/woden/trunk/java/ant-test/build.xml
incubator/woden/trunk/java/build.properties
incubator/woden/trunk/java/build.xml
Propchange: incubator/woden/trunk/java/ant-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 11 13:08:26 2006
@@ -3,3 +3,4 @@
results
test.xml
report.xml
+test
Modified: incubator/woden/trunk/java/ant-test/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/build.xml?view=diff&rev=473798&r1=473797&r2=473798
==============================================================================
--- incubator/woden/trunk/java/ant-test/build.xml (original)
+++ incubator/woden/trunk/java/ant-test/build.xml Sat Nov 11 13:08:26 2006
@@ -5,6 +5,9 @@
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
@@ -22,9 +25,8 @@
<property name="lib.dir" location="${woden.dir}/build" />
<property name="downloads.lib.dir"
location="${woden.dir}/downloads/lib" />
- <property name="desc.dir" location="${woden.dir}/../desc" />
- <property name="test-suite.dir" location="${desc.dir}/test-suite" />
- <property name="xsd.dir" location="${test-suite.dir}/interchange" />
+ <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"
/>
@@ -54,13 +56,13 @@
<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="${xsd.dir}/xml.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component";
file="${xsd.dir}/wsdlcm.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-base";
file="${xsd.dir}/wsdlcm-base.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-extensions";
file="${xsd.dir}/wsdlcm-extensions.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-http";
file="${xsd.dir}/wsdlcm-http.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-rpc";
file="${xsd.dir}/wsdlcm-rpc.xsd" />
- <schema
namespace="http://www.w3.org/2002/ws/desc/wsdl/component-soap";
file="${xsd.dir}/wsdlcm-soap.xsd" />
+ <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>
Modified: incubator/woden/trunk/java/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.properties?view=diff&rev=473798&r1=473797&r2=473798
==============================================================================
--- incubator/woden/trunk/java/build.properties (original)
+++ incubator/woden/trunk/java/build.properties Sat Nov 11 13:08:26 2006
@@ -37,6 +37,8 @@
StaxFile = stax-api-1.0.1.jar
WstxURL =
http://mirrors.dotsrc.org/maven/woodstox/jars/wstx-asl-3.0.1.jar
WstxFile = wstx-asl-3.0.1.jar
+W3cWsdl20URL =
http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/zips/test-suite.zip
+W3cWsdl20File = test-suite.zip
! The location of the Woden build home
build.home = ${basedir}
Modified: incubator/woden/trunk/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.xml?view=diff&rev=473798&r1=473797&r2=473798
==============================================================================
--- incubator/woden/trunk/java/build.xml (original)
+++ incubator/woden/trunk/java/build.xml Sat Nov 11 13:08:26 2006
@@ -26,6 +26,7 @@
<property name="version" value="1.0.0" />
<property name="downloads" value="${build.home}/downloads" />
<property name="libraryDir" value="${downloads}/lib" />
+ <property name="w3cDir" value="${downloads}/w3c" />
<property name="build.classes" value="${build.output}/classes" />
<property name="build.classes.api" value="${build.output}/classesapi" />
<property name="build.classes.ant" value="${build.output}/classesant" />
@@ -49,6 +50,7 @@
<echo message="build.output=${build.output}" />
<echo message="downloads=${downloads}" />
<echo message="libraryDir=${libraryDir}" />
+ <echo message="w3cDir=${w3cDir}" />
<echo message="build.classes=${build.classes}" />
<echo message="build.classes.api=${build.classes.api}" />
<echo message="build.classes.ant=${build.classes.ant}" />
@@ -80,6 +82,8 @@
<echo message="StaxFile=${StaxFile}" />
<echo message="WstxURL=${WstxURL}" />
<echo message="WstxFile=${WstxFile}" />
+ <echo message="W3cWsdl20URL=${W3cWsdl20URL}" />
+ <echo message="W3cWsdl20File=${W3cWsdl20File}" />
<echo message="build.home=${build.home}" />
<echo message="version=${version}" />
<echo message="milestone=${milestone}" />
@@ -130,6 +134,10 @@
<available file="${libraryDir}/${StaxFile}"
property="Stax.exists" />
<available file="${libraryDir}/${WstxFile}"
property="Wstx.exists" />
+ <!-- The following zip is downloaded into the w3cDir -->
+ <mkdir dir="${w3cDir}" />
+ <available file="${w3cDir}/${W3cWsdl20File}"
property="W3cWsdl20.exists" />
+
<antcall target="getXmlSchema" />
<antcall target="getXerces" />
<antcall target="getAnt" />
@@ -139,6 +147,7 @@
<antcall target="getCommonsLogging" />
<antcall target="getStax" />
<antcall target="getWstx" />
+ <antcall target="getW3cWsdl20" />
<antcall target="extractXmlSchema" />
@@ -174,7 +183,7 @@
</patternset>
</unzip>
</target>
-
+
<!-- Get the latest version of Ant and unzip it -->
<target name="getAnt" unless="Ant.exists">
<get src="${AntURL}" dest="${downloads}/${AntFile}" />
@@ -197,6 +206,13 @@
</unzip>
</target>
+ <!-- Get the latest W3C WSDL 2.0 Test Cases and Schemas and unzip it -->
+ <target name="getW3cWsdl20" unless="W3cWsdl20.exists">
+ <get src="${W3cWsdl20URL}" dest="${downloads}/${W3cWsdl20File}"
/>
+
+ <unzip src="${downloads}/${W3cWsdl20File}" dest="${w3cDir}" />
+ </target>
+
<!-- Get the latest version of Axiom Api jar -->
<target name="getAxiomApi" unless="AxiomApi.exists">
<get src="${AxiomApiURL}" dest="${libraryDir}/${AxiomApiFile}"
/>
@@ -231,22 +247,20 @@
This task produces woden.jar. -->
<target name="buildImplAndAPI" depends="init">
<mkdir dir="${build.classes}" />
- <javac sourcepath=""
- srcdir="${src.home}"
- destdir="${build.classes}">
+ <javac sourcepath="" srcdir="${src.home}"
destdir="${build.classes}">
<classpath>
<fileset dir="${libraryDir}">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
</classpath>
<include name="**/*.java" />
- <exclude name="org/apache/woden/ant/*.java"/>
+ <exclude name="org/apache/woden/ant/*.java" />
</javac>
<!-- Copy all non Java files. -->
<copy todir="${build.classes}">
<fileset dir="${src.home}">
<include name="**/*" />
- <exclude name="org/apache/woden/ant/**/*"/>
+ <exclude name="org/apache/woden/ant/**/*" />
<exclude name="**/*.java" />
</fileset>
</copy>
@@ -271,7 +285,7 @@
<include name="**/*.java" />
<exclude name="**/internal/**/*.java" />
<exclude name="**/tool/converter/*.java" />
- <exclude name="org/apache/woden/ant/**/*.java"/>
+ <exclude name="org/apache/woden/ant/**/*.java" />
</javac>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.api}">
@@ -280,7 +294,7 @@
<exclude name="**/*.java" />
<exclude name="**/internal/**/*" />
<exclude name="**/tool/converter/*.java" />
- <exclude name="org.apache.woden.ant/**/*"/>
+ <exclude name="org.apache.woden.ant/**/*" />
</fileset>
</copy>
@@ -301,12 +315,12 @@
<target name="buildANT" depends="init">
<mkdir dir="${build.classes.ant}" />
<javac sourcepath="" srcdir="${src.home}"
destdir="${build.classes.ant}"
classpath="${build.output}/${impl.name}.jar;${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile}">
- <include name="org/apache/woden/ant/**/*.java"/>
+ <include name="org/apache/woden/ant/**/*.java" />
</javac>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.ant}">
<fileset dir="${src.home}">
- <include name="org.apache.woden.ant/**/*"/>
+ <include name="org.apache.woden.ant/**/*" />
</fileset>
</copy>
@@ -363,7 +377,7 @@
<javadoc destdir="${build.javadoc}">
<classpath>
<fileset dir="${libraryDir}">
- <include name="**/*.jar"/>
+ <include name="**/*.jar" />
</fileset>
</classpath>
<fileset dir="${src.home}">
@@ -496,7 +510,7 @@
<antcall target="createZip" />
<antcall target="createTarGzBz2" />
- <antcall target="createSrcZip"/>
+ <antcall target="createSrcZip" />
<antcall target="createSrcTarGzBz2" />
</target>
@@ -504,15 +518,15 @@
<!-- This target is not meant to be called on its own -->
<target name="createZip" depends="init">
<zip destfile="${build.output}/${archive.name}-${buildId}.zip">
- <zipfileset dir="${archiveDir}"
prefix="${archive.root.prefix}-${buildId}"/>
- </zip>
+ <zipfileset dir="${archiveDir}"
prefix="${archive.root.prefix}-${buildId}" />
+ </zip>
</target>
<!-- Builds a tar.gz and tar.bz2 of the distributable dir -->
<!-- This target is not meant to be called on its own -->
<target name="createTarGzBz2" depends="init">
<tar destfile="${build.output}/${archive.name}-${buildId}.tar">
- <tarfileset dir="${archiveDir}"
prefix="${archive.root.prefix}-${buildId}"/>
+ <tarfileset dir="${archiveDir}"
prefix="${archive.root.prefix}-${buildId}" />
</tar>
<gzip
destfile="${build.output}/${archive.name}-${buildId}.tar.gz"
src="${build.output}/${archive.name}-${buildId}.tar" />
<bzip2
destfile="${build.output}/${archive.name}-${buildId}.tar.bz2"
src="${build.output}/${archive.name}-${buildId}.tar" />
@@ -523,19 +537,19 @@
<!-- This target is not meant to be called on its own -->
<target name="createSrcZip" depends="init">
<zip
destfile="${build.output}/${archive.name}-${buildId}-src.zip">
- <zipfileset dir="${build.home}/src"
prefix="${archive.root.prefix}-${buildId}/src"/>
- <zipfileset dir="${build.home}/test"
prefix="${archive.root.prefix}-${buildId}/test"/>
- <zipfileset dir="${build.home}/ant-test"
prefix="${archive.root.prefix}-${buildId}/ant-test"/>
- <zipfileset dir="${build.home}/eclipseplugin"
prefix="${archive.root.prefix}-${buildId}/eclipseplugin"/>
- <zipfileset dir="${build.home}"
prefix="${archive.root.prefix}-${buildId}">
- <include name="LICENSE*"/>
- <include name="NOTICE"/>
- <include name="README"/>
- <include name="build.properties"/>
- <include name="build.xml"/>
- <include name="pom.xml"/>
- <include name="release-notes.html"/>
- </zipfileset>
+ <zipfileset dir="${build.home}/src"
prefix="${archive.root.prefix}-${buildId}/src" />
+ <zipfileset dir="${build.home}/test"
prefix="${archive.root.prefix}-${buildId}/test" />
+ <zipfileset dir="${build.home}/ant-test"
prefix="${archive.root.prefix}-${buildId}/ant-test" />
+ <zipfileset dir="${build.home}/eclipseplugin"
prefix="${archive.root.prefix}-${buildId}/eclipseplugin" />
+ <zipfileset dir="${build.home}"
prefix="${archive.root.prefix}-${buildId}">
+ <include name="LICENSE*" />
+ <include name="NOTICE" />
+ <include name="README" />
+ <include name="build.properties" />
+ <include name="build.xml" />
+ <include name="pom.xml" />
+ <include name="release-notes.html" />
+ </zipfileset>
</zip>
</target>
@@ -543,19 +557,19 @@
<!-- This target is not meant to be called on its own -->
<target name="createSrcTarGzBz2" depends="init">
<tar
destfile="${build.output}/${archive.name}-${buildId}-src.tar">
- <tarfileset dir="${build.home}/src"
prefix="${archive.root.prefix}-${buildId}/src"/>
- <tarfileset dir="${build.home}/test"
prefix="${archive.root.prefix}-${buildId}/test"/>
- <tarfileset dir="${build.home}/ant-test"
prefix="${archive.root.prefix}-${buildId}/ant-test"/>
- <tarfileset dir="${build.home}/eclipseplugin"
prefix="${archive.root.prefix}-${buildId}/eclipseplugin"/>
- <tarfileset dir="${build.home}"
prefix="${archive.root.prefix}-${buildId}">
- <include name="LICENSE*"/>
- <include name="NOTICE"/>
- <include name="README"/>
- <include name="build.properties"/>
- <include name="build.xml"/>
- <include name="pom.xml"/>
- <include name="release-notes.html"/>
- </tarfileset>
+ <tarfileset dir="${build.home}/src"
prefix="${archive.root.prefix}-${buildId}/src" />
+ <tarfileset dir="${build.home}/test"
prefix="${archive.root.prefix}-${buildId}/test" />
+ <tarfileset dir="${build.home}/ant-test"
prefix="${archive.root.prefix}-${buildId}/ant-test" />
+ <tarfileset dir="${build.home}/eclipseplugin"
prefix="${archive.root.prefix}-${buildId}/eclipseplugin" />
+ <tarfileset dir="${build.home}"
prefix="${archive.root.prefix}-${buildId}">
+ <include name="LICENSE*" />
+ <include name="NOTICE" />
+ <include name="README" />
+ <include name="build.properties" />
+ <include name="build.xml" />
+ <include name="pom.xml" />
+ <include name="release-notes.html" />
+ </tarfileset>
</tar>
<gzip
destfile="${build.output}/${archive.name}-${buildId}-src.tar.gz"
src="${build.output}/${archive.name}-${buildId}-src.tar" />
<bzip2
destfile="${build.output}/${archive.name}-${buildId}-src.tar.bz2"
src="${build.output}/${archive.name}-${buildId}-src.tar" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
