Author: jkaputin
Date: Mon Oct 2 14:36:43 2006
New Revision: 452227
URL: http://svn.apache.org/viewvc?view=rev&rev=452227
Log:
Merged latest trunk updates to M6 branch
Modified:
incubator/woden/branches/M6/build.properties
incubator/woden/branches/M6/build.xml
Modified: incubator/woden/branches/M6/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M6/build.properties?view=diff&rev=452227&r1=452226&r2=452227
==============================================================================
--- incubator/woden/branches/M6/build.properties (original)
+++ incubator/woden/branches/M6/build.properties Mon Oct 2 14:36:43 2006
@@ -18,15 +18,15 @@
! Prereq information
XmlSchemaURL =
http://people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/ws/commons/XmlSchema/1.1/XmlSchema-1.1.jar
XmlSchemaFile = XmlSchema-1.1.jar
-XercesURL =
http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.8.0.zip
-XercesFile = Xerces-J-bin.2.8.0.zip
+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
XercesJar2 = xml-apis.jar
AntURL =
http://www.apache.org/dist/ant/binaries/apache-ant-1.6.5-bin.zip
AntFile = apache-ant-1.6.5-bin.zip
AntJar = ant.jar
-WSDL4JURL =
http://internap.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.2.zip
-WSDL4JFile = wsdl4j-bin-1.5.2.zip
+WSDL4JURL =
http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.3.zip
+WSDL4JFile = wsdl4j-bin-1.5.3.zip
AxiomApiURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-api-1.1.1.jar
AxiomApiFile = axiom-api-1.1.1.jar
AxiomImplURL =
http://www.apache.org/dist/java-repository/ws-commons/jars/axiom-impl-1.1.1.jar
@@ -35,8 +35,8 @@
CommonsLoggingFile = commons-logging-api-1.1.jar
StaxURL =
http://www.ibiblio.org/maven/stax/jars/stax-api-1.0.1.jar
StaxFile = stax-api-1.0.1.jar
-WstxURL =
http://mirrors.dotsrc.org/maven/woodstox/jars/wstx-asl-2.9.3.jar
-WstxFile = wstx-asl-2.9.3.jar
+WstxURL =
http://mirrors.dotsrc.org/maven/woodstox/jars/wstx-asl-3.0.1.jar
+WstxFile = wstx-asl-3.0.1.jar
! The location of the Woden build home
build.home = ${basedir}
@@ -58,4 +58,5 @@
ant.name = woden-ant
! Woden Archive name
-archive.name = woden-incubating
+archive.name = apache-woden-incubating
+archive.root.prefix = woden-incubating
Modified: incubator/woden/branches/M6/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/M6/build.xml?view=diff&rev=452227&r1=452226&r2=452227
==============================================================================
--- incubator/woden/branches/M6/build.xml (original)
+++ incubator/woden/branches/M6/build.xml Mon Oct 2 14:36:43 2006
@@ -84,6 +84,7 @@
<echo message="version=${version}" />
<echo message="milestone=${milestone}" />
<echo message="buildType=${buildType}" />
+ <echo message="archive.root.prefix=${archive.root.prefix}" />
</target>
@@ -105,7 +106,7 @@
<available classname="junit.framework.Test"
property="junitAvailable" />
- <property name="archiveDir"
value="${build.output}/${archive.name}-${buildId}" />
+ <property name="archiveDir"
value="${build.output}/${archive.root.prefix}-${buildId}" />
</target>
@@ -419,7 +420,7 @@
</target>
<!-- Create the zip and tar.gz archives -->
- <target name="createArchives">
+ <target name="createArchives" depends="init">
<mkdir dir="${archiveDir}" />
<mkdir dir="${archiveDir}/lib" />
<mkdir dir="${archiveDir}/doc" />
@@ -457,22 +458,26 @@
</copy>
<antcall target="createZip" />
- <antcall target="createTarGz" />
+ <antcall target="createTarGzBz2" />
</target>
<!-- Builds a zip of the distributable dir -->
<!-- This target is not meant to be called on its own -->
<target name="createZip" depends="init">
- <zip destfile="${build.output}/${archive.name}-${buildId}.zip"
basedir="${archiveDir}" />
+ <zip destfile="${build.output}/${archive.name}-${buildId}.zip">
+ <zipfileset dir="${archiveDir}"
prefix="${archive.root.prefix}-${buildId}"/>
+ </zip>
</target>
- <!-- Builds a tar.gz of the distributable dir -->
+ <!-- Builds a tar.gz and tar.bz2 of the distributable dir -->
<!-- This target is not meant to be called on its own -->
- <target name="createTarGz" depends="init">
- <tar tarfile="${build.output}/${archive.name}-${buildId}.tar"
basedir="${archiveDir}" />
- <gzip
zipfile="${build.output}/${archive.name}-${buildId}.tar.gz"
src="${build.output}/${archive.name}-${buildId}.tar" />
- <bzip2 src="${build.output}/${archive.name}-${buildId}.tar.gz"
destfile="${build.output}/${archive.name}-${buildId}.tar.bz2" />
- <delete file="${build.output}/$archive.name}-${buildId}.tar" />
+ <target name="createTarGzBz2" depends="init">
+ <tar destfile="${build.output}/${archive.name}-${buildId}.tar">
+ <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" />
+ <delete file="${build.output}/${archive.name}-${buildId}.tar" />
</target>
<!-- Create checksums for the zip and tar.gz files -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
