You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by th...@apache.org on 2006/10/29 18:08:51 UTC
svn commit: r468943 -
/webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml
Author: thilina
Date: Sun Oct 29 09:08:51 2006
New Revision: 468943
URL: http://svn.apache.org/viewvc?view=rev&rev=468943
Log:
Updated the std-maven.xml which goes with the src distro to reflect the main maven.xml
Modified:
webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml
Modified: webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml?view=diff&rev=468943&r1=468942&r2=468943
==============================================================================
--- webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml (original)
+++ webservices/axis2/branches/java/1_1/release-docs/maven-scripts/maven-std.xml Sun Oct 29 09:08:51 2006
@@ -25,18 +25,21 @@
|
| clean
| Deletes the 'target' directory in all projects
-
- | clean-repo
- | Deletes the 'target' directory in all projects
|
- | war
- | Build the war
+ | dist-bin
+ | Creates the main binary distribution
|
- | maven war-withsamples
- | build the war with the default samples
+ | dist-docs
+ | Creates the javadocs distribution (without xdocs)
+ |
+ | dist-src
+ | Creates the source distribution
|
| release
- | Creates the complete release
+ | Creates the release (dist-bin, dist-src,dist-docs, war)
+ |
+ | war
+ | Build the war
-->
<project default="jar"
@@ -54,22 +57,22 @@
<j:set var="dist.dir" value="target/dist"/>
<tstamp>
- <format property="release_date" pattern="10 07, 2006" locale="en"/>
+ <format property="release_date" pattern="MMMM d, yyyy" locale="en"/>
</tstamp>
-
+
<!-- Test for >= JDK 1.5 to determine whether to include modules that require it -->
-
+
<ant:echo>${ant.java.version}</ant:echo>
-
+
<j:if test="${ant.java.version == '1.5'}">
<ant:echo>
JDK ${ant.java.version} detected, including the following modules:
- ${maven.multiproject.includes.requiresJDK15}
+ ${maven.multiproject.includes.requiresJDK15}
</ant:echo>
<j:set var="maven.multiproject.includes"
- value="${maven.multiproject.includes},${maven.multiproject.includes.requiresJDK15}"/>
+ value="${maven.multiproject.includes},${maven.multiproject.includes.requiresJDK15}"/>
</j:if>
-
+
<j:set var="modules" value="*"/>
<preGoal name="modules:reactor:init">
@@ -324,7 +327,7 @@
<goal name="clean-repo">
<ant:delete>
<ant:fileset dir="${maven.repo.local}">
- <ant:include name="axis/jars/axis2*.jar"/>
+ <ant:include name="org.apache.axis2/jars/axis2*.jar"/>
</ant:fileset>
</ant:delete>
</goal>
@@ -377,6 +380,17 @@
<ant:mkdir dir="target/temp/war/toWEB-INF/services"/>
<ant:mkdir dir="target/temp/war/toWEB-INF/conf"/>
+
+ <!-- let's now remove un-necessary jars. Please refer -->
+ <!-- http://marc.theaimsgroup.com/?l=axis-dev&m=116047407714969&w=2, if you wanna know-->
+ <!-- why I removed this. -->
+ <ant:delete>
+ <fileset dir="${war_dep_cache}">
+ <include name="bcel-${bcel.version}.jar"/>
+ <include name="jibx-bind-${jibx.version}.jar"/>
+ </fileset>
+ </ant:delete>
+
<!-- Copy the java2wsdl jar -->
<ant:copy toDir="target/temp/war/lib">
<ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
@@ -391,10 +405,11 @@
<ant:copy toDir="target/temp/war/lib">
<ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
</ant:copy>
-
- <!-- Copy the adb codegen jar -->
+
+ <!-- Copy the adb codegen jar -->
<ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/adb-codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>
+ <ant:fileset
+ file="modules/adb-codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>
</ant:copy>
<!-- Copy the java2wsdl jar -->
@@ -411,13 +426,13 @@
<ant:copy toDir="target/temp/war/lib">
<ant:fileset file="modules/xmlbeans/target/axis2-xmlbeans-${pom.currentVersion}.jar"/>
</ant:copy>
-
- <!-- Copy the spring jar -->
+
+ <!-- Copy the spring jar -->
<ant:copy toDir="target/temp/war/lib">
<ant:fileset file="modules/spring/target/axis2-spring-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Copy the spring jar -->
+ <!-- Copy the saaj jar -->
<ant:copy toDir="target/temp/war/lib">
<ant:fileset file="modules/saaj/target/axis2-saaj-${pom.currentVersion}.jar"/>
</ant:copy>
@@ -427,12 +442,12 @@
<ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Copy items that depend on JDK1.5 -->
- <j:if test="${ant.java.version == '1.5'}">
-
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
- </ant:copy>
+ <!-- Copy items that depend on JDK1.5 -->
+ <j:if test="${ant.java.version == '1.5'}">
+
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
+ </ant:copy>
</j:if>
<!-- Copy the soapmonitor jar - the servlet classes -->
@@ -451,17 +466,18 @@
<ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
</ant:copy>
- <echo file="target/temp/war/toWEB-INF/modules/modules.list" append="false">addressing-${addressing_version}.mar
- soapmonitor-${soapmonitor_version}.mar
- </echo>
+ <echo file="target/temp/war/toWEB-INF/modules/modules.list" append="false">
+ addressing-${addressing_version}.mar
+ soapmonitor-${soapmonitor_version}.mar
+ </echo>
<!-- copy the sample services -->
<ant:copy toDir="target/temp/war/toWEB-INF/services">
<ant:fileset file="modules/samples/target/toWar/services/version.aar"/>
</ant:copy>
- <echo file="target/temp/war/toWEB-INF/services/services.list" append="false">version.aar
- </echo>
+ <echo file="target/temp/war/toWEB-INF/services/services.list" append="false">version.aar
+ </echo>
<!-- copy the axis2.xml into conf directoy -->
<ant:copy toDir="target/temp/war/toWEB-INF/conf">
@@ -510,7 +526,7 @@
<!--- Create the Release -->
<!-- ================================================================ -->
<goal name="release"
- prereqs="jar,dist-min-bin,dist-min-src,dist-std-bin,dist-std-src,dist-war,dist-docs">
+ prereqs="jar,dist-bin,dist-src,dist-docs,war">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Axis2 Distributions</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
@@ -532,150 +548,113 @@
<ant:filter token="axis2_version" value="${pom.currentVersion}"/>
<ant:filter token="release_date" value="${release_date}"/>
- <property name="min_dep_cache" value="target/temp/cache/min"/>
<property name="std_dep_cache" value="target/temp/cache/std"/>
<property name="war_dep_cache" value="target/temp/cache/war"/>
<ant:mkdir dir="target/dist"/>
</goal>
- <goal name="dist-min-bin" prereqs="jar,init-dist,cache-min-deps">
+ <goal name="dist-bin" prereqs="jar,init-dist,cache-std-deps">
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:echo>| Creating: Axis2 Minimal Binary Distribution</ant:echo>
+ <ant:echo>| Creating: Axis2 Main Binary Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:mkdir dir="target/dist"/>
- <ant:mkdir dir="target/temp/min/bin/lib"/>
+ <ant:property name="std.bin.temp.dir" value="target/temp/main/axis2-${pom.currentVersion}"/>
- <!-- Copy the 3rd party libs -->
- <ant:copy toDir="target/temp/min/bin/lib">
- <ant:fileset dir="${min_dep_cache}"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/repository"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/repository/modules"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/repository/services"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/bin"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/conf"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/webapp"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/webapp/WEB-INF"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/webapp/WEB-INF/classes"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/webapp/axis2-web"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/lib"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/samples"/>
+
+ <!--********************** creating the repository ********************** -->
+ <!-- copy the soapmonitor mar -->
+ <ant:copy toDir="${std.bin.temp.dir}/repository/modules">
+ <ant:fileset file="modules/soapmonitor/target/soapmonitor-${soapmonitor_version}.mar"/>
</ant:copy>
- <!-- Delete testing jars -->
- <echo message="Deleting Unwanted testing jars"/>
- <ant:delete>
- <fileset dir="target/temp/min/bin/lib">
- <include name="**/ant*.jar"/>
- <include name="**/xmlunit*.jar"/>
- <include name="**/junit*.jar"/>
- </fileset>
- </ant:delete>
+ <!-- copy the addressing mar -->
+ <ant:copy toDir="${std.bin.temp.dir}/repository/modules">
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
+ </ant:copy>
+ <echo file="${std.bin.temp.dir}/repository/modules/modules.list" append="false">
+ addressing-${addressing_version}.mar
+ soapmonitor-${soapmonitor_version}.mar
+ </echo>
- <!--copy NOTICE.txt file-->
- <ant:copy toFile="target/temp/min/bin/NOTICE.txt">
- <ant:fileset file="NOTICE.txt"/>
+ <!-- copy the sample services -->
+ <!-- TODO copy other sample-XXX.aar too -->
+ <ant:copy toDir="${std.bin.temp.dir}/repository/services">
+ <ant:fileset file="modules/samples/target/toWar/services/version.aar"/>
</ant:copy>
- <!-- Copy the java2wsdl jar -->
- <ant:copy toDir="target/temp/min/bin/lib">
- <ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
- </ant:copy>
+ <echo file="${std.bin.temp.dir}/repository/services/services.list" append="false">
+ version.aar
+ </echo>
- <!-- Copy the kernel jar -->
- <ant:copy toDir="target/temp/min/bin/lib">
- <ant:fileset file="modules/kernel/target/axis2-kernel-${pom.currentVersion}.jar"/>
+ <!--********************** creating the bin ********************** -->
+ <!-- Copy bin scripts -->
+ <ant:copy todir="${std.bin.temp.dir}/bin">
+ <ant:fileset dir="modules/tool/script"/>
</ant:copy>
- <!-- Copy the adb jar -->
- <ant:copy toDir="target/temp/min/bin/lib">
- <ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
+ <!--********************** creating the conf ********************** -->
+ <!-- copy the axis2.xml into conf directoy -->
+ <ant:copy toDir="${std.bin.temp.dir}/conf">
+ <ant:fileset file="modules/kernel/conf/axis2.xml"/>
</ant:copy>
- <!-- Copy the adb codegen jar -->
- <ant:copy toDir="target/temp/min/bin/lib">
- <ant:fileset file="modules/adb-codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>
+ <!--********************** creating the webappp ********************** -->
+ <!-- copy the web.xml into webapp/WEB-INF directory -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp/WEB-INF">
+ <ant:fileset file="modules/webapp/conf/web.xml"/>
</ant:copy>
-
- <!-- Copy the release documents -->
- <macros:copy-release-docs toDir="target/temp/min/bin"
- readmeFile="release-docs/readme-files/README-min-bin.txt"/>
- <ant:mkdir dir="${dist.dir}"/>
- <ant:zip file="${dist.dir}/axis2-min-${pom.currentVersion}-bin.zip"
- basedir="target/temp/min/bin"/>
- <ant:delete dir="target/temp/min/bin"/>
- </goal>
-
- <goal name="dist-min-src" prereqs="init-dist">
- <ant:echo>+----------------------------------------------</ant:echo>
- <ant:echo>| Creating: Axis2 Minimal Source Distribution</ant:echo>
- <ant:echo>+----------------------------------------------</ant:echo>
-
- <ant:mkdir dir="target/dist"/>
- <ant:mkdir dir="target/temp/min/src"/>
-
- <ant:copy toDir="target/temp/min/src">
- <ant:fileset dir=".">
- <ant:include name="**/etc/**"/>
- <ant:include name="**/modules/java2wsdl/**"/>
- <ant:include name="**/modules/kernel/**"/>
- <ant:include name="**/modules/adb/**"/>
- <ant:include name="**/modules/adb-codegen/**"/>
- <ant:exclude name="**/SameServiceAddingTest.java"/>
- <!-- TODO: This is failing in the distros. Must Fix it. -->
- <ant:exclude name="**/target/**"/>
- <ant:exclude name="**/*class*/**"/>
- <ant:exclude name="**/.svn/**"/>
- <ant:exclude name="**/bin/**"/>
- <ant:exclude name="**/*.log"/>
- <ant:exclude name=".*"/>
- <ant:exclude name="**/*.license"/>
- <ant:exclude name="**/*.iml"/>
- </ant:fileset>
- </ant:copy>
- <ant:copy toDir="target/temp/min/src/etc" overwrite="true" filtering="on">
- <ant:fileset dir="release-docs/release-etc/min"/>
+ <!-- copy the build.xml into webapp directory -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp">
+ <ant:fileset file="modules/webapp/scripts/build.xml"/>
</ant:copy>
- <!-- Copy the master maven files for the minimal src distro -->
- <ant:copy toFile="target/temp/min/src/maven.xml">
- <ant:fileset file="release-docs/maven-scripts/maven-min.xml"/>
- </ant:copy>
- <ant:copy toDir="target/temp/min/src">
- <ant:fileset file="project.xml"/>
+ <!-- copy *.properties to webapp/WEB-INF/classes directory -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp/WEB-INF/classes">
+ <ant:fileset dir="modules/kernel/conf">
+ <ant:include name="*.properties"/>
+ </ant:fileset>
</ant:copy>
- <!-- Copy the release documents -->
- <macros:copy-release-docs toDir="target/temp/min/src"
- readmeFile="release-docs/readme-files/README-min-src.txt"/>
-
- <ant:zip file="${dist.dir}/axis2-min-${pom.currentVersion}-src.zip">
- <ant:fileset dir="target/temp/min/src"/>
- </ant:zip>
- <ant:delete dir="target/temp/min/src"/>
- </goal>
-
- <goal name="dist-std-bin" prereqs="jar,init-dist,cache-std-deps">
- <ant:echo>+----------------------------------------------</ant:echo>
- <ant:echo>| Creating: Axis2 Standard Binary Distribution</ant:echo>
- <ant:echo>+----------------------------------------------</ant:echo>
-
- <ant:property name="std.bin.temp.dir" value="target/temp/std/bin"/>
-
- <ant:mkdir dir="${std.bin.temp.dir}/lib"/>
- <ant:mkdir dir="${std.bin.temp.dir}/bin"/>
- <ant:mkdir dir="${std.bin.temp.dir}/modules"/>
- <ant:mkdir dir="${std.bin.temp.dir}/samples"/>
-
- <!-- Copy bin scripts -->
- <ant:copy todir="${std.bin.temp.dir}/bin">
- <ant:fileset dir="modules/tool/script"/>
+ <!-- copy contents of the webapp module to webapp/axis2-web directory -->
+ <ant:copy toDir="${std.bin.temp.dir}/webapp/axis2-web">
+ <ant:fileset dir="modules/webapp">
+ <ant:exclude name="project.xml"/>
+ <ant:exclude name="**/*.iml"/>
+ <ant:exclude name="**/.*"/>
+ <ant:exclude name="**/conf/**"/>
+ <ant:exclude name="**/scripts/**"/>
+ </ant:fileset>
</ant:copy>
- <!--copy NOTICE.txt file-->
- <ant:copy toFile="${std.bin.temp.dir}/NOTICE.txt" filtering="on">
- <ant:fileset file="NOTICE.txt"/>
- </ant:copy>
-
+ <!--********************** creating the lib ********************** -->
<!-- Copy the 3rd party libs -->
<ant:copy toDir="${std.bin.temp.dir}/lib">
- <ant:fileset dir="${min_dep_cache}"/>
<ant:fileset dir="${std_dep_cache}"/>
</ant:copy>
+ <!-- Deleting bcel, jaxme, spring jars -->
+ <ant:delete>
+ <fileset dir="${std.bin.temp.dir}/lib">
+ <include name="bcel-${bcel.version}.jar"/>
+ <include name="spring*.*"/>
+ <include name="jaxme*.*"/>
+ </fileset>
+ </ant:delete>
<!-- Delete tesing jars -->
<echo message="Deleting Unwanted testing jars"/>
@@ -692,104 +671,95 @@
<ant:fileset file="modules/kernel/target/axis2-kernel-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
- <ant:fileset file="modules/adb-codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>
+ <ant:fileset
+ file="modules/adb-codegen/target/axis2-adb-codegen-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/xmlbeans/target/axis2-xmlbeans-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/saaj/target/axis2-saaj-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy items that depend on JDK1.5 -->
- <j:if test="${ant.java.version == '1.5'}">
- <ant:copy toDir="${std.bin.temp.dir}/lib">
- <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
- </ant:copy>
- </j:if>
-
- <!-- Copy addressing mar -->
- <ant:copy toDir="${std.bin.temp.dir}/modules">
- <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
- </ant:copy>
-
- <!-- Copy addressing mar to the classpath (Samples need this) -->
- <ant:copy toDir="${std.bin.temp.dir}/lib">
- <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
- </ant:copy>
-
- <!-- Copy the codegen jar -->
- <ant:copy toDir="${std.bin.temp.dir}/lib">
- <ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the xmlbeans jar -->
- <ant:copy toDir="${std.bin.temp.dir}/lib">
- <ant:fileset file="modules/xmlbeans/target/axis2-xmlbeans-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the tools jar -->
- <ant:copy toDir="${std.bin.temp.dir}/lib">
<ant:fileset file="modules/tool/target/axis2-tools-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the spring support jar -->
- <ant:copy toDir="${std.bin.temp.dir}/lib">
<ant:fileset file="modules/spring/target/axis2-spring-${pom.currentVersion}.jar"/>
+ <ant:fileset
+ file="modules/soapmonitor/target/axis2-soapmonitor-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Copy the samples -->
+ <!-- Copy items that depend on JDK1.5 -->
+ <j:if test="${ant.java.version == '1.5'}">
+ <ant:copy toDir="${std.bin.temp.dir}/lib">
+ <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
+ </ant:copy>
+ </j:if>
+
+
+ <!--********************** creating the samples ********************** -->
+ <!-- TODO :Copy the samples.. after samples module refactoring -->
<ant:copy todir="${std.bin.temp.dir}/samples">
<ant:fileset dir="modules/samples/target/samples"/>
</ant:copy>
- <ant:copy todir="${std.bin.temp.dir}/samples/userguide">
+ <!--ant:copy todir="${std.bin.temp.dir}/samples/userguide">
<ant:fileset file="${std.bin.temp.dir}/samples/groovyService.aar"/>
+ </ant:copy-->
+ <ant:mkdir dir="${std.bin.temp.dir}/samples/FaultHandling"/>
+ <ant:copy todir="${std.bin.temp.dir}/samples/">
+ <ant:fileset dir="modules/samples/">
+ <include name="yahoorestsearch/**/*.*"/>
+ <include name="googlespellcheck/**/*.*"/>
+ <include name="FaultHandling/**/*.*"/>
+ <include name="mtom/**/*.*"/>
+ <include name="mtomsample/**/*.*"/>
+ <include name="soapwithattachments/**/*.*"/>
+ <include name="version/**/*.*"/>
+ <include name="jms/**/*.*"/>
+ <include name="sessions/**/*.*"/>
+ <include name="servicelifecycle/**/*.*"/>
+ <include name="pojo/**/*.*"/>
+ </ant:fileset>
</ant:copy>
+
<ant:delete file="${std.bin.temp.dir}/samples/groovyService.aar"/>
- <!-- Copy the release documents -->
- <macros:copy-release-docs toDir="${std.bin.temp.dir}"
- readmeFile="release-docs/readme-files/README-std-bin.txt"/>
- <ant:zip file="${dist.dir}/axis2-std-${pom.currentVersion}-bin.zip"
- basedir="${std.bin.temp.dir}"/>
- <ant:delete dir="${std.bin.temp.dir}"/>
+ <!--copy NOTICE.txt file-->
+ <ant:copy toFile="${std.bin.temp.dir}/NOTICE.txt" filtering="on">
+ <ant:fileset file="NOTICE.txt"/>
+ </ant:copy>
+ <ant:zip file="${dist.dir}/axis2-${pom.currentVersion}.zip"
+ basedir="target/temp/main"/>
+ <ant:delete dir="target/temp/main"/>
</goal>
- <goal name="dist-std-src" prereqs="init-dist">
+ <goal name="dist-src" prereqs="init-dist">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Axis2 Standard Source Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:property name="std.src.temp.dir" value="target/temp/std/src"/>
+ <ant:property name="src.temp.dir" value="target/temp/src/axis2-${pom.currentVersion}/src"/>
+ <ant:mkdir dir="target/temp/src"/>
+ <ant:mkdir dir="target/temp/src/axis2-${pom.currentVersion}"/>
+ <ant:mkdir dir="${src.temp.dir}"/>
- <!-- Copy bin scripts -->
- <ant:copy todir="${std.src.temp.dir}/bin">
- <ant:fileset dir="modules/tool/script"/>
- </ant:copy>
-
- <ant:copy toDir="${std.src.temp.dir}">
+ <ant:copy toDir="${src.temp.dir}">
<ant:fileset dir=".">
<ant:include name="**/etc/**"/>
<ant:include name="**/modules/java2wsdl/**"/>
<ant:include name="**/modules/kernel/**"/>
<ant:include name="**/modules/adb/**"/>
- <ant:include name="**/modules/adb-codegen/**"/>
+ <ant:include name="**/modules/adb-codegen/**"/>
<ant:include name="**/modules/codegen/**"/>
<ant:include name="**/modules/webapp/**"/>
<ant:include name="**/modules/xmlbeans/**"/>
<ant:include name="**/modules/jibx/**"/>
- <!--ant:include name="**/modules/jaxbri/**"/-->
+ <ant:include name="**/modules/jaxbri/**"/>
<ant:include name="**/modules/addressing/**"/>
<ant:include name="**/modules/saaj/**"/>
<ant:include name="**/modules/samples/**"/>
- <ant:include name="**/modules/soapmonitor/**"/>
+ <ant:include name="**/modules/soapmonitor/**"/>
<ant:include name="**/modules/spring/**"/>
<ant:include name="**/modules/tool/**"/>
<ant:exclude name="**/SameServiceAddingTest.java"/>
<!-- TODO: This is failing in the distros. Must Fix it. -->
<ant:exclude name="**/target/**"/>
- <ant:exclude name="**/modules/samples/src/sample/eventing/**"/>
- <ant:exclude name="**/modules/samples/src/sample/yahooservices/**"/>
- <ant:exclude name="**/modules/samples/src/sample/axis2rest/**"/>
- <ant:exclude name="**/modules/tool/axis2-idea-plugin/**"/>
+ <ant:exclude name="**/modules/samples/eventing/**"/>
+ <ant:exclude name="**/modules/samples/security/**"/>
<ant:exclude name="xdocs/**"/>
<ant:exclude name="**/*class*/**"/>
<ant:exclude name="**/.svn/**"/>
@@ -800,26 +770,25 @@
<ant:exclude name="**/*.iml"/>
</ant:fileset>
</ant:copy>
- <ant:copy toDir="${std.src.temp.dir}/etc" overwrite="true" filtering="on">
- <ant:fileset dir="release-docs/release-etc/std"/>
- </ant:copy>
+ <ant:copy toDir="${src.temp.dir}/etc" overwrite="true" filtering="on" file="etc/project.properties"/>
+ <ant:copy toDir="${src.temp.dir}" overwrite="true" filtering="on" file="NOTICE.txt"/>
<!-- Copy the master maven files for the standard src distro -->
- <ant:copy toFile="${std.src.temp.dir}/maven.xml">
- <ant:fileset file="release-docs/maven-scripts/maven-std.xml"/>
+ <ant:copy toFile="${src.temp.dir}/maven.xml">
+ <ant:fileset file="maven.xml"/>
</ant:copy>
- <ant:copy toDir="${std.src.temp.dir}">
+ <ant:copy toDir="${src.temp.dir}">
<ant:fileset file="project.xml"/>
</ant:copy>
+
+ <ant:copy toDir="${src.temp.dir}">
+ <ant:fileset file="README.txt"/>
+ </ant:copy>
- <!-- Copy the release documents -->
- <macros:copy-release-docs toDir="${std.src.temp.dir}"
- readmeFile="release-docs/readme-files/README-std-src.txt"/>
-
- <ant:zip file="${dist.dir}/axis2-std-${pom.currentVersion}-src.zip">
- <ant:fileset dir="${std.src.temp.dir}"/>
+ <ant:zip file="${dist.dir}/axis2-${pom.currentVersion}-src.zip">
+ <ant:fileset dir="target/temp/src"/>
</ant:zip>
- <ant:delete dir="${std.src.temp.dir}"/>
+ <ant:delete dir="target/temp/src"/>
</goal>
<goal name="dist-war" prereqs="war">
@@ -834,53 +803,29 @@
<ant:echo>+----------------------------------------------</ant:echo>
<ant:mkdir dir="target/dist"/>
- <ant:mkdir dir="target/temp/docs/xdocs"/>
- <ant:mkdir dir="target/temp/docs/javadocs"/>
-
- <ant:copy toDir="target/temp/docs/xdocs">
- <ant:fileset dir="xdocs"/>
- </ant:copy>
-
- <!-- Delete 0.93 docs -->
- <ant:delete dir="target/temp/docs/xdocs/0_93"/>
+ <ant:property name="docs.temp.dir"
+ value="target/temp/docs/axis2-${pom.currentVersion}/docs"/>
+ <ant:mkdir dir="${docs.temp.dir}"/>
+ <ant:mkdir dir="${docs.temp.dir}/javadocs"/>
- <ant:copy toDir="target/temp/docs/javadocs">
+ <ant:copy toDir="${docs.temp.dir}/javadocs">
<ant:fileset dir="target/apidocs"/>
</ant:copy>
- <macros:copy-release-docs toDir="target/temp/docs"
- readmeFile="release-docs/readme-files/README-docs.txt"/>
-
<ant:zip file="${dist.dir}/axis2-${pom.currentVersion}-docs.zip">
<ant:fileset dir="target/temp/docs"/>
</ant:zip>
- <ant:delete dir="target/temp/docs"/>
+ <!--ant:delete dir="target/temp/docs"/-->
<ant:echo message="***** IMPORTANT: Please manually copy the Eclipse & IDEA plugins"/>
</goal>
- <goal name="cache-min-deps" prereqs="init-dist">
- <ant:mkdir dir="${min_dep_cache}"/>
- <j:if test="${minDeps.uptodate != 'yes'}">
- <macros:copy-deps copyToDir="${min_dep_cache}"
- mods="kernel,adb,java2wsdl"/>
- <property name="minDeps.uptodate" value="yes"/>
- </j:if>
-
- <!--remove testing jars-->
- <ant:delete dir="${min_dep_cache}">
- <ant:include name="junit*.jar"/>
- <ant:include name="xmlunit*.jar"/>
- <ant:include name="maven-itest*.jar"/>
- </ant:delete>
- </goal>
-
- <goal name="cache-std-deps" prereqs="init-dist,cache-min-deps">
+ <goal name="cache-std-deps" prereqs="init-dist">
<ant:mkdir dir="${std_dep_cache}"/>
<j:if test="${stdDeps.uptodate != 'yes'}">
<macros:copy-deps copyToDir="${std_dep_cache}"
- mods="codegen,jibx,spring,saaj"/>
+ mods="codegen,jibx,spring,saaj,kernel,adb,java2wsdl"/>
<property name="stdDeps.uptodate" value="yes"/>
</j:if>
@@ -912,7 +857,7 @@
<!-- ================================================================ -->
<!--- Create the Java Docs -->
<!-- ================================================================ -->
- <goal name="javadocs" prereqs="init, create-lib">
+ <goal name="javadocs" prereqs="jar,init, create-lib">
<ant:javadoc packagenames="org.apache.axis2.*"
defaultexcludes="yes"
destdir="target/apidocs"
@@ -925,18 +870,20 @@
line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
<ant:sourcepath>
<ant:pathelement location="modules/adb/src"/>
+ <ant:pathelement location="modules/adb-codegen/src"/>
<ant:pathelement location="modules/addressing/src"/>
<ant:pathelement location="modules/codegen/src"/>
- <ant:pathelement location="modules/xmlbeans/src"/>
<ant:pathelement location="modules/java2wsdl/src"/>
- <ant:pathelement location="modules/kernel/src"/>
- <ant:pathelement location="modules/jaxws/src"/>
+ <!-- Cannot run the build in jdk1.4 when jaxbri is included -->
+ <!--ant:pathelement location="modules/jaxbri/src"/-->
<ant:pathelement location="modules/jibx/src"/>
- <ant:pathelement location="modules/jaxbri/src"/>
+ <ant:pathelement location="modules/kernel/src"/>
<ant:pathelement location="modules/saaj/src"/>
- <ant:pathelement location="modules/security/src"/>
- <ant:pathelement location="modules/spring/src"/>
+ <!-- we are not shipping jaxws with 1.1 -->
+ <!--ant:pathelement location="modules/jaxws/src"/-->
<ant:pathelement location="modules/soapmonitor/src"/>
+ <ant:pathelement location="modules/spring/src"/>
+ <ant:pathelement location="modules/xmlbeans/src"/>
</ant:sourcepath>
<ant:classpath>
<ant:fileset dir="target/lib">
@@ -1018,15 +965,14 @@
<ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Copy items that depend on JDK1.5 -->
- <j:if test="${ant.java.version == '1.5'}">
- <ant:copy toDir="${destdir}">
- <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
- </ant:copy>
- </j:if>
-
+ <!-- Copy items that depend on JDK1.5 -->
+ <j:if test="${ant.java.version == '1.5'}">
+ <ant:copy toDir="${destdir}">
+ <ant:fileset file="modules/jaxbri/target/axis2-jaxbri-${pom.currentVersion}.jar"/>
+ </ant:copy>
+ </j:if>
</goal>
-
+
<define:taglib uri="macros">
<define:tag name="copy-deps">
<!--
@@ -1121,6 +1067,10 @@
<property name="modules" value="*"/>
</define:tag>
<define:tag name="copy-release-docs">
+
+ <filter token="axisVersion" value="${pom.currentVersion}"/>
+ <filter token="TODAY" value="${TODAY}"/>
+
<ant:copy toFile="${toDir}/README.txt" filtering="on">
<ant:fileset file="${readmeFile}"/>
</ant:copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org