Author: gturrell
Date: Fri Jul 27 08:56:23 2007
New Revision: 560290
URL: http://svn.apache.org/viewvc?view=rev&rev=560290
Log:
Modifying build.xml/properties to extract xmlschema.jar from ws-commons zip
file since jar not provided
in 1.3.2 release directory. This may be required for trunk also - awaiting
outcome of discussion with ws-commons release team...
Modified:
incubator/woden/branches/M7b/build.properties
incubator/woden/branches/M7b/build.xml
Modified: incubator/woden/branches/M7b/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7b/build.properties?view=diff&rev=560290&r1=560289&r2=560290
==============================================================================
--- incubator/woden/branches/M7b/build.properties (original)
+++ incubator/woden/branches/M7b/build.properties Fri Jul 27 08:56:23 2007
@@ -16,8 +16,9 @@
###########################################################################
! Prereq information
-XmlSchemaURL =
http://archive.apache.org/dist/ws/commons/XmlSchema/1_3_1/XmlSchema-1.3.1.jar
-XmlSchemaFile = XmlSchema-1.3.1.jar
+XmlSchemaURL =
http://archive.apache.org/dist/ws/commons/XmlSchema/1_3_2/XmlSchema-1.3.2-bin.zip
+XmlSchemaFile = XmlSchema-1.3.2-bin.zip
+XmlSchemaJar = XmlSchema-1.3.2.jar
XercesURL =
http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.8.1.zip
XercesFile = Xerces-J-bin.2.8.1.zip
XercesJar1 = xercesImpl.jar
@@ -27,9 +28,9 @@
AntJar = ant.jar
WSDL4JURL =
http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.6.2.zip
WSDL4JFile = wsdl4j-bin-1.6.2.zip
-AxiomApiURL =
http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-api/1.2.3/axiom-api-1.2.3.jar
-AxiomApiFile = axiom-api-1.2.3.jar
-AxiomImplURL =
http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-impl/1.2.3/axiom-impl-1.2.3.jar
+AxiomApiURL =
http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-api/1.2.5/axiom-api-1.2.5.jar
+AxiomApiFile = axiom-api-1.2.5.jar
+AxiomImplURL =
http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-impl/1.2.5/axiom-impl-1.2.5.jar
AxiomImplFile = axiom-impl-1.2.3.jar
CommonsLoggingURL =
http://www.ibiblio.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar
CommonsLoggingFile = commons-logging-api-1.1.jar
Modified: incubator/woden/branches/M7b/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M7b/build.xml?view=diff&rev=560290&r1=560289&r2=560290
==============================================================================
--- incubator/woden/branches/M7b/build.xml (original)
+++ incubator/woden/branches/M7b/build.xml Fri Jul 27 08:56:23 2007
@@ -75,6 +75,7 @@
<echo message="build.javadoc=${build.javadoc}" />
<echo message="XmlSchemaURL=${XmlSchemaURL}" />
<echo message="XmlSchemaFile=${XmlSchemaFile}" />
+ <echo message="XmlSchemaJar=${XmlSchemaJar}" />
<echo message="XercesURL=${XercesURL}" />
<echo message="XercesFile=${XercesFile}" />
<echo message="XercesJar1=${XercesJar1}" />
@@ -154,7 +155,7 @@
<available file="${libraryDir}/${CommonsLoggingFile}"
property="CommonsLogging.exists" />
<available file="${libraryDir}/${StaxFile}"
property="Stax.exists" />
<available file="${libraryDir}/${WstxFile}"
property="Wstx.exists" />
- <available file="${libraryDir}/${XmlSchemaFile}"
property="XmlSchema.exists" />
+ <available file="${libraryDir}/${XmlSchemaJar}"
property="XmlSchema.exists" />
<antcall target="getXmlSchema" />
<antcall target="getXerces" />
@@ -183,9 +184,15 @@
</delete>
</target>
- <!-- Get the latest version of XmlSchema from WS commons -->
+ <!-- Get and unzip the latest version of XmlSchema from WS commons -->
<target name="getXmlSchema" unless="XmlSchema.exists">
- <get src="${XmlSchemaURL}"
dest="${libraryDir}/${XmlSchemaFile}" />
+ <get src="${XmlSchemaURL}" dest="${downloads}/${XmlSchemaFile}"
/>
+
+ <unzip src="${downloads}/${XmlSchemaFile}" dest="${libraryDir}">
+ <patternset>
+ <include name="**/${XmlSchemaJar}" />
+ </patternset>
+ </unzip>
</target>
<!-- Get the latest version of Xerces and unzip it -->
@@ -324,7 +331,7 @@
This task produces woden-api.jar. -->
<target name="buildAPI" depends="init">
<mkdir dir="${build.classes.api}" />
- <javac debug="true" debuglevel="vars,lines,source"
sourcepath="" srcdir="${src.home}" destdir="${build.classes.api}"
classpath="${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile}">
+ <javac debug="true" debuglevel="vars,lines,source"
sourcepath="" srcdir="${src.home}" destdir="${build.classes.api}"
classpath="${libraryDir}/${XmlSchemaJar};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile}">
<include name="**/*.java" />
<exclude name="**/internal/**/*.java" />
<exclude name="**/tool/converter/*.java" />
@@ -358,7 +365,7 @@
This task produces woden-ant.jar. -->
<target name="buildANT" depends="init">
<mkdir dir="${build.classes.ant}" />
- <javac debug="true" debuglevel="vars,lines,source"
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}">
+ <javac debug="true" debuglevel="vars,lines,source"
sourcepath="" srcdir="${src.home}" destdir="${build.classes.ant}"
classpath="${build.output}/${impl.name}.jar;${libraryDir}/${XmlSchemaJar};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile}">
<include name="org/apache/woden/ant/**/*.java" />
</javac>
<!-- Copy all non Java files. -->
@@ -396,7 +403,7 @@
This task produces woden-tests.jar. -->
<target name="buildTests" depends="init, informJunit, buildImplAndAPI,
buildANT" if="junitAvailable">
<mkdir dir="${build.classes.test}" />
- <javac debug="true" debuglevel="vars,lines,source"
sourcepath="" srcdir="${testsrc.home}" destdir="${build.classes.test}"
classpath="${libraryDir}/${XmlSchemaFile};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile};${build.output}/${impl.name}.jar;${build.output}/${ant.name}.jar"
/>
+ <javac debug="true" debuglevel="vars,lines,source"
sourcepath="" srcdir="${testsrc.home}" destdir="${build.classes.test}"
classpath="${libraryDir}/${XmlSchemaJar};${libraryDir}/${XercesJar1};${libraryDir}/${XercesJar2};${libraryDir}/${AxiomApiFile};${libraryDir}/${AxiomImplFile};${libraryDir}/${CommonsLoggingFile};${libraryDir}/${StaxFile};${libraryDir}/${WstxFile};${build.output}/${impl.name}.jar;${build.output}/${ant.name}.jar"
/>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.test}">
<fileset dir="${testsrc.home}">
@@ -440,7 +447,7 @@
<pathelement location="${build.classes}" />
<pathelement location="${build.classes.ant}" />
<pathelement location="${build.classes.test}" />
- <pathelement
location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement
location="${libraryDir}/${XmlSchemaJar}" />
<pathelement
location="${libraryDir}/${AxiomImplFile}" />
<pathelement
location="${libraryDir}/${AxiomApiFile}" />
<pathelement
location="${libraryDir}/${CommonsLoggingFile}" />
@@ -498,7 +505,7 @@
<classpath>
<pathelement location="${build.classes}" />
<pathelement location="${build.classes.test}" />
- <pathelement
location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement
location="${libraryDir}/${XmlSchemaJar}" />
<pathelement
location="${libraryDir}/${XercesJar1}" />
<pathelement
location="${libraryDir}/${XercesJar2}" />
</classpath>
@@ -526,7 +533,7 @@
<classpath>
<pathelement location="${build.classes}" />
<pathelement location="${build.classes.test}" />
- <pathelement
location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement
location="${libraryDir}/${XmlSchemaJar}" />
<pathelement
location="${libraryDir}/${AxiomApiFile}" />
<pathelement
location="${libraryDir}/${AxiomImplFile}" />
<pathelement
location="${libraryDir}/${CommonsLoggingFile}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
