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 2007/04/03 08:02:11 UTC
svn commit: r525045 - in /webservices/axis2/branches/java/1_2:
etc/project.properties maven.xml modules/parent/pom.xml
Author: deepal
Date: Mon Apr 2 23:02:10 2007
New Revision: 525045
URL: http://svn.apache.org/viewvc?view=rev&rev=525045
Log:
exclude saaj from the 1.4 build
Modified:
webservices/axis2/branches/java/1_2/etc/project.properties
webservices/axis2/branches/java/1_2/maven.xml
webservices/axis2/branches/java/1_2/modules/parent/pom.xml
Modified: webservices/axis2/branches/java/1_2/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/etc/project.properties?view=diff&rev=525045&r1=525044&r2=525045
==============================================================================
--- webservices/axis2/branches/java/1_2/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_2/etc/project.properties Mon Apr 2 23:02:10 2007
@@ -77,6 +77,8 @@
modules/saaj/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/branches/java/1_2/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/maven.xml?view=diff&rev=525045&r1=525044&r2=525045
==============================================================================
--- webservices/axis2/branches/java/1_2/maven.xml (original)
+++ webservices/axis2/branches/java/1_2/maven.xml Mon Apr 2 23:02:10 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">
Modified: webservices/axis2/branches/java/1_2/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/parent/pom.xml?view=diff&rev=525045&r1=525044&r2=525045
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_2/modules/parent/pom.xml Mon Apr 2 23:02:10 2007
@@ -127,7 +127,8 @@
<log4j.version>1.2.13</log4j.version>
<jettison.version>1.0-alpha-2-SNAPSHOT</jettison.version>
<tomcat.tribes.version>6.0.10</tomcat.tribes.version>
- <tomcat.juli.version>6.0.10</tomcat.juli.version>
+ <tomcat.juli.version>6.0.10</tomcat.juli.version>
+
</properties>
<mailingLists>
<mailingList>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org