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 de...@apache.org on 2007/04/03 08:28:05 UTC
svn commit: r525051 - in /webservices/axis2/trunk/java:
etc/project.properties maven.xml
Author: deepal
Date: Mon Apr 2 23:28:04 2007
New Revision: 525051
URL: http://svn.apache.org/viewvc?view=rev&rev=525051
Log:
Exclude saaj from 1.4 build
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/maven.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=525051&r1=525050&r2=525051
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Mon Apr 2 23:28:04 2007
@@ -77,6 +77,8 @@
modules/jaxbri/project.xml,\
modules/jaxws/project.xml,\
modules/jaxws-api/project.xml,\
+modules/saaj-api/project.xml,\
+modules/saaj/project.xml,\
modules/scripting/project.xml
#modules/clustering/project.xml
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/maven.xml?view=diff&rev=525051&r1=525050&r2=525051
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Mon Apr 2 23:28:04 2007
@@ -347,15 +347,11 @@
</goal>
<goal name="create-jar" prereqs="init">
- <!-- Hack for now, don't fail building jar if saaj is absent -->
- <ant:mkdir dir="modules/saaj/target/classes"/>
-
<jar destfile="target/lib/axis2-${pom.currentVersion}.jar">
<fileset dir="modules/java2wsdl/target/classes"/>
<fileset dir="modules/kernel/target/classes"/>
<!-- adding the tool classes. This is needed to get the ant task -->
<fileset dir="modules/tool/target/classes"/>
- <fileset dir="modules/saaj/target/classes"/>
<fileset dir="modules/addressing/target/classes"/>
<fileset dir="modules/codegen/target/classes"/>
<fileset dir="modules/adb/target/classes"/>
@@ -364,6 +360,16 @@
<fileset dir="modules/addressing/target/">
<include name="modules/addressing-${addressing_version}.mar"/>
</fileset>
+ <!-- Copy items that depend on JDK1.5 -->
+ <j:if test="${javaVersion == '1.5'}">
+ <fileset dir="modules/saaj/target/classes"/>
+ <fileset dir="modules/saaj-api/target/classes"/>
+ <fileset dir="modules/jaxbri/target/classes"/>
+ <fileset dir="modules/metadata/target/classes"/>
+ <fileset dir="modules/jaxws/target/classes"/>
+ <fileset dir="modules/jaxws-api/target/classes"/>
+ </j:if>
+
</jar>
</goal>
@@ -451,13 +457,6 @@
<ant:fileset file="modules/spring/target/axis2-spring-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Copy the saaj jar -->
- <!-- This should only happen if jdk version is 1.5 - sumedha
- <ant:copy toDir="target/temp/war/lib">
- <ant:fileset file="modules/saaj/target/axis2-saaj-${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"/>
@@ -724,7 +723,6 @@
<ant:fileset file="modules/jibx/target/axis2-jibx-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/json/target/axis2-json-${pom.currentVersion}.jar"/>
- <ant:fileset file="modules/saaj/target/axis2-saaj-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/tool/target/axis2-tools-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/spring/target/axis2-spring-${pom.currentVersion}.jar"/>
<ant:fileset
@@ -990,12 +988,18 @@
<!--ant:pathelement location="modules/jaxbri/src"/-->
<ant:pathelement location="modules/jibx/src"/>
<ant:pathelement location="modules/kernel/src"/>
- <ant:pathelement location="modules/saaj/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"/>
+ <!-- Copy items that depend on JDK1.5 -->
+ <j:if test="${javaVersion == '1.5'}">
+ <ant:pathelement location="modules/saaj/src"/>
+ <ant:pathelement location="modules/saaj-api/src"/>
+ <ant:pathelement location="modules/jaxbri/src"/>
+ </j:if>
</ant:sourcepath>
<ant:classpath>
<ant:fileset dir="target/lib">
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org