You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/05/03 16:39:35 UTC
svn commit: r399317 -
/webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
Author: deepal
Date: Wed May 3 07:39:33 2006
New Revision: 399317
URL: http://svn.apache.org/viewcvs?rev=399317&view=rev
Log:
maven war fails again
Modified:
webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
Modified: webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml?rev=399317&r1=399316&r2=399317&view=diff
==============================================================================
--- webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml (original)
+++ webservices/axis2/trunk/java/release-docs/maven-scripts/maven-std.xml Wed May 3 07:39:33 2006
@@ -161,15 +161,6 @@
</j:choose>
</j:forEach>
</goal>
- <goal name="cache-war-deps" prereqs="init-dist">
- <ant:mkdir dir="${war_dep_cache}"/>
- <j:if test="${warDeps.uptodate != 'yes'}">
- <macros:copy-deps copyToDir="${war_dep_cache}"
- mods="webapp"/>
- <property name="warDeps.uptodate" value="yes"/>
- </j:if>
- </goal>
-
<!-- Helper tags for modules -->
<define:taglib uri="local:modules">
@@ -303,115 +294,6 @@
<attainGoal name="clean-repo"/>
</goal>
-<!-- ================================================================ -->
- <!--- Create the War -->
- <!-- ================================================================ -->
- <goal name="war" prereqs="jar,init-dist,cache-war-deps">
-
- <ant:mkdir dir="target/temp/war/toWEB-INF/modules"/>
- <ant:mkdir dir="target/temp/war/toWEB-INF/services"/>
- <ant:mkdir dir="target/temp/war/toWEB-INF/conf"/>
-
- <attainGoal name="create-kernel"/>
-
- <!-- Create axis2-core.jar -->
- <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
- <fileset dir="modules/java2wsdl/target/classes"/>
- <fileset dir="modules/core/target/classes/"/>
- <fileset dir="modules/common/target/classes/"/>
- </jar>
-
- <!-- Copy the adb jar -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the java2wsdl jar -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the codegen jar -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the xmlbeans jar -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/xmlbeans/target/axis2-xmlbeans-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the jibx jar -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- Copy the soapmonitor jar - the servlet classes -->
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/soapmonitor/target/axis2-soapmonitor-${pom.currentVersion}.jar"/>
- </ant:copy>
-
- <!-- copy the soapmonitor mar -->
- <ant:copy toDir="target/temp/war/toWEB-INF/modules">
- <ant:fileset file="modules/soapmonitor/target/soapmonitor-${soapmonitor_version}.mar"/>
- </ant:copy>
-
- <!-- copy the addressing mar -->
- <ant:copy toDir="target/temp/war/toWEB-INF/modules">
- <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
- </ant:copy>
-
- <!-- 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>
-
- <!-- copy the axis2.xml into conf directoy -->
- <ant:copy toDir="target/temp/war/toWEB-INF/conf">
- <ant:fileset file="modules/core/conf/axis2.xml"/>
- </ant:copy>
- <ant:copy toDir="target/temp/war/axis2-web">
- <ant:fileset dir="modules/webapp">
- <ant:exclude name="project.xml"/>
- <ant:exclude name="**/*.iml"/>
- <ant:exclude name="**/.*"/>
- <ant:exclude name="**/conf/**"/>
- </ant:fileset>
- </ant:copy>
-
- <ant:war destfile="target/dist/axis2.war"
- webxml="modules/webapp/conf/web.xml">
- <!--<ant:fileset dir="modules/webapp">-->
- <!--<ant:exclude name="project.xml"/>-->
- <!--<ant:exclude name="**/*.iml"/>-->
- <!--<ant:exclude name="**/.*"/>-->
- <!--<ant:exclude name="**/conf/**"/>-->
- <!--</ant:fileset>-->
- <ant:lib dir="target/temp/war/lib">
- <ant:include name="**"/>
- <ant:exclude name="**servlet**"/>
- <ant:exclude name="ant*.jar"/>
- </ant:lib>
- <ant:lib dir="${war_dep_cache}">
- <ant:include name="**"/>
- <ant:exclude name="**servlet**"/>
- <ant:exclude name="ant*.jar"/>
- </ant:lib>
- <ant:classes dir="modules/core/conf">
- <ant:include name="*.properties"/>
- </ant:classes>
- <!-- <ant:webinf dir="modules/core/src/org/apache/axis2/deployment">
- <ant:include name="*.xml"/>
- </ant:webinf> -->
- <ant:webinf dir="target/temp/war/toWEB-INF"/>
- <ant:fileset dir="target/temp/war">
- <ant:include name="**/axis2-web/**" />
- </ant:fileset>
- </ant:war>
- </goal>
-
-
-
<!-- ================================================================ -->
<!--- Clean the Repository -->
<!-- ================================================================ -->
@@ -447,7 +329,7 @@
</goal>
<goal name="create-lib">
- <macros:copy-deps copyToDir="${target/lib}" mods="*"/>
+ <macros:copy-deps copyToDir="${target/lib}"/>
</goal>
<!-- ================================================================ -->
@@ -586,11 +468,6 @@
<define:taglib uri="macros">
<define:tag name="copy-deps">
- <!--
- PLEASE don't check in with these lines enabled.
- <ant:echo message="######## MODULES=${mods}"/>
- <ant:echo message="######## Copy2Dir=${copyToDir}"/>
- -->
<j:set var="modules" value="${mods}"/>
<!-- ######################### REACTOR INIT ##########################################-->
@@ -677,17 +554,121 @@
</j:forEach>
<property name="modules" value="*"/>
</define:tag>
- <define:tag name="copy-release-docs">
- <ant:copy toFile="${toDir}/README.txt" filtering="on">
- <ant:fileset file="${readmeFile}"/>
- </ant:copy>
- <ant:copy toFile="${toDir}/release-notes.html" filtering="on">
- <ant:fileset file="release-notes.html"/>
- </ant:copy>
- <ant:copy toFile="${toDir}/LICENSE.txt" filtering="on">
- <ant:fileset file="LICENSE.txt"/>
- </ant:copy>
- </define:tag>
</define:taglib>
+<!-- ================================================================ -->
+ <!--- Create the War -->
+ <!-- ================================================================ -->
+ <goal name="war" prereqs="jar,init-dist,cache-war-deps">
+
+ <ant:mkdir dir="target/temp/war/toWEB-INF/modules"/>
+ <ant:mkdir dir="target/temp/war/toWEB-INF/services"/>
+ <ant:mkdir dir="target/temp/war/toWEB-INF/conf"/>
+
+ <attainGoal name="create-kernel"/>
+
+ <!-- Create axis2-core.jar -->
+ <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
+ <fileset dir="modules/java2wsdl/target/classes"/>
+ <fileset dir="modules/core/target/classes/"/>
+ <fileset dir="modules/common/target/classes/"/>
+ </jar>
+
+ <!-- Copy the adb jar -->
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
+ </ant:copy>
+
+ <!-- Copy the java2wsdl jar -->
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/java2wsdl/target/axis2-java2wsdl-${pom.currentVersion}.jar"/>
+ </ant:copy>
+
+ <!-- Copy the codegen jar -->
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
+ </ant:copy>
+
+ <!-- Copy the xmlbeans jar -->
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/xmlbeans/target/axis2-xmlbeans-${pom.currentVersion}.jar"/>
+ </ant:copy>
+
+ <!-- Copy the jibx jar -->
+ <ant:copy toDir="target/temp/war/lib">
+ <ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
+ </ant:copy>
+
+ <!-- copy the addressing mar -->
+ <ant:copy toDir="target/temp/war/toWEB-INF/modules">
+ <ant:fileset file="modules/addressing/target/addressing-${addressing_version}.mar"/>
+ </ant:copy>
+
+ <!-- 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>
+
+ <!-- copy the axis2.xml into conf directoy -->
+ <ant:copy toDir="target/temp/war/toWEB-INF/conf">
+ <ant:fileset file="modules/core/conf/axis2.xml"/>
+ </ant:copy>
+ <ant:copy toDir="target/temp/war/axis2-web">
+ <ant:fileset dir="modules/webapp">
+ <ant:exclude name="project.xml"/>
+ <ant:exclude name="**/*.iml"/>
+ <ant:exclude name="**/.*"/>
+ <ant:exclude name="**/conf/**"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:war destfile="target/dist/axis2.war"
+ webxml="modules/webapp/conf/web.xml">
+ <!--<ant:fileset dir="modules/webapp">-->
+ <!--<ant:exclude name="project.xml"/>-->
+ <!--<ant:exclude name="**/*.iml"/>-->
+ <!--<ant:exclude name="**/.*"/>-->
+ <!--<ant:exclude name="**/conf/**"/>-->
+ <!--</ant:fileset>-->
+ <ant:lib dir="target/temp/war/lib">
+ <ant:include name="**"/>
+ <ant:exclude name="**servlet**"/>
+ <ant:exclude name="ant*.jar"/>
+ </ant:lib>
+ <ant:lib dir="${war_dep_cache}">
+ <ant:include name="**"/>
+ <ant:exclude name="**servlet**"/>
+ <ant:exclude name="ant*.jar"/>
+ </ant:lib>
+ <ant:classes dir="modules/core/conf">
+ <ant:include name="*.properties"/>
+ </ant:classes>
+ <!-- <ant:webinf dir="modules/core/src/org/apache/axis2/deployment">
+ <ant:include name="*.xml"/>
+ </ant:webinf> -->
+ <ant:webinf dir="target/temp/war/toWEB-INF"/>
+ <ant:fileset dir="target/temp/war">
+ <ant:include name="**/axis2-web/**" />
+ </ant:fileset>
+ </ant:war>
+ </goal>
+ <!--<goal name="cache-war-deps" prereqs="init-dist,cache-std-deps">-->
+ <goal name="cache-war-deps" prereqs="init-dist">
+ <ant:mkdir dir="${war_dep_cache}"/>
+ <j:if test="${warDeps.uptodate != 'yes'}">
+ <macros:copy-deps copyToDir="${war_dep_cache}"
+ mods="webapp"/>
+ <property name="warDeps.uptodate" value="yes"/>
+ </j:if>
+ </goal>
+<goal name="create-kernel">
+ <ant:mkdir dir="target/temp/war/lib"/>
+ <!-- Create axis2-core.jar -->
+ <jar destfile="target/temp/war/lib/axis2-kernel-${pom.currentVersion}.jar">
+ <fileset dir="modules/java2wsdl/target/classes"/>
+ <fileset dir="modules/core/target/classes/"/>
+ <fileset dir="modules/common/target/classes/"/>
+ </jar>
+ </goal>
+
</project>