Author: jkaputin
Date: Fri Oct 6 07:38:13 2006
New Revision: 453613
URL: http://svn.apache.org/viewvc?view=rev&rev=453613
Log:
Merged in changes from M6 branch:
updated WSDL4J dependency to 1.6.1
include LICENSE and NOTICE files in /META-INF directory of all jar files
generate source archives and checksums - zip, tar.gz, tar.bz2
Modified:
incubator/woden/trunk/java/build.properties
incubator/woden/trunk/java/build.xml
Modified: incubator/woden/trunk/java/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.properties?view=diff&rev=453613&r1=453612&r2=453613
==============================================================================
--- incubator/woden/trunk/java/build.properties (original)
+++ incubator/woden/trunk/java/build.properties Fri Oct 6 07:38:13 2006
@@ -25,8 +25,8 @@
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://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.5.3.zip
-WSDL4JFile = wsdl4j-bin-1.5.3.zip
+WSDL4JURL =
http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.6.1.zip
+WSDL4JFile = wsdl4j-bin-1.6.1.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
Modified: incubator/woden/trunk/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.xml?view=diff&rev=453613&r1=453612&r2=453613
==============================================================================
--- incubator/woden/trunk/java/build.xml (original)
+++ incubator/woden/trunk/java/build.xml Fri Oct 6 07:38:13 2006
@@ -251,6 +251,15 @@
</fileset>
</copy>
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.classes}/META-INF" />
+ <copy todir="${build.classes}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
<jar destfile="${build.output}/${impl.name}.jar"
basedir="${build.classes}" />
</target>
@@ -275,6 +284,15 @@
</fileset>
</copy>
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.classes.api}/META-INF" />
+ <copy todir="${build.classes.api}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
<jar destfile="${build.output}/${api.name}.jar"
basedir="${build.classes.api}" />
</target>
@@ -292,6 +310,15 @@
</fileset>
</copy>
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.classes.ant}/META-INF" />
+ <copy todir="${build.classes.ant}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
<jar destfile="${build.output}/${ant.name}.jar"
basedir="${build.classes.ant}" />
</target>
@@ -319,6 +346,15 @@
</fileset>
</copy>
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.classes.test}/META-INF" />
+ <copy todir="${build.classes.test}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
<jar destfile="${build.output}/${test.name}.jar"
basedir="${build.classes.test}" />
</target>
@@ -459,6 +495,8 @@
<antcall target="createZip" />
<antcall target="createTarGzBz2" />
+ <antcall target="createSrcZip"/>
+ <antcall target="createSrcTarGzBz2" />
</target>
<!-- Builds a zip of the distributable dir -->
@@ -480,6 +518,49 @@
<delete file="${build.output}/${archive.name}-${buildId}.tar" />
</target>
+ <!-- Builds a zip of the source code -->
+ <!-- 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>
+ </zip>
+ </target>
+
+ <!-- Builds a tar.gz and tar.bz2 of the source code -->
+ <!-- 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>
+ </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" />
+ <delete
file="${build.output}/${archive.name}-${buildId}-src.tar" />
+ </target>
+
<!-- Create checksums for the zip and tar.gz files -->
<target name="createChecksums">
<checksum file="${build.output}/${archive.name}-${buildId}.zip"
/>
@@ -488,6 +569,12 @@
<checksum
file="${build.output}/${archive.name}-${buildId}.tar.gz" algorithm="SHA"
fileext=".sha1" />
<checksum
file="${build.output}/${archive.name}-${buildId}.tar.bz2" />
<checksum
file="${build.output}/${archive.name}-${buildId}.tar.bz2" algorithm="SHA"
fileext=".sha1" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.zip" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.zip" algorithm="SHA"
fileext=".sha1" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.tar.gz" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.tar.gz" algorithm="SHA"
fileext=".sha1" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.tar.bz2" />
+ <checksum
file="${build.output}/${archive.name}-${buildId}-src.tar.bz2" algorithm="SHA"
fileext=".sha1" />
</target>
<!-- A clean target to be run before builds. -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
