axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r489844 - in /webservices/axis2/trunk/java: build.xml etc/project.properties modules/saaj-api/project.properties
Date Sat, 23 Dec 2006 03:23:46 GMT
Author: dims
Date: Fri Dec 22 19:23:45 2006
New Revision: 489844

URL: http://svn.apache.org/viewvc?view=rev&rev=489844
Log:
fix maven from inside ant on win32, add jar target

Modified:
    webservices/axis2/trunk/java/build.xml
    webservices/axis2/trunk/java/etc/project.properties
    webservices/axis2/trunk/java/modules/saaj-api/project.properties

Modified: webservices/axis2/trunk/java/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/build.xml?view=diff&rev=489844&r1=489843&r2=489844
==============================================================================
--- webservices/axis2/trunk/java/build.xml (original)
+++ webservices/axis2/trunk/java/build.xml Fri Dec 22 19:23:45 2006
@@ -24,7 +24,7 @@
   <!--read in project properties, including library versions-->
   <property file="etc/project.properties"/>
 
-  
+  <property environment="env"/>
   
   <target name="default">
 
@@ -33,20 +33,36 @@
   <target name="init" >
     <!--macro for maven -->
     <property name="maven.commoncmd" value="--emacs" />
-    <condition property="maven.line" 
-        value="--offline ${maven.commoncmd}">
-      <istrue value="${offline}"/>
+
+    <condition property="maven.executable" value="cmd.exe">
+      <os family="windows" />
     </condition>
 
-    <condition property="maven.executable" value="maven.bat">
+    <condition property="maven.line1" value="/c ${env.MAVEN_HOME}/bin/maven.bat">
       <os family="windows" />
     </condition>
+
+    <condition property="maven.line2" 
+        value="--offline ${maven.commoncmd}">
+      <istrue value="${offline}"/>
+    </condition>
+    
+    <condition property="maven.line3" 
+        value="-Dmaven.test.skip=true">
+      <istrue value="${skip}"/>
+    </condition>
+
     <property name="maven.executable" value="maven" />
+	<property name="maven.line1" value="" />
+	<property name="maven.line2" value="" />
+	<property name="maven.line3" value="" />
 
     <property name="maven.line" value="${maven.commoncmd}" />
     <presetdef name="maven">
       <exec failonerror="true" executable="${maven.executable}">
-       <arg line="${maven.line}" />
+       <arg line="${maven.line1}" />
+       <arg line="${maven.line2}" />
+       <arg line="${maven.line3}" />
       </exec>
     </presetdef>
 
@@ -79,6 +95,13 @@
     </maven>
   </target>
 
+  <target name="jar" depends="init"
+      description="run jar target">
+    <maven>
+      <arg value="jar"/>
+    </maven>
+  </target>
+
   <target name="dist" depends="init"
       description="make a distribution">
     <maven>
@@ -89,13 +112,15 @@
       description="make a distribution, skip testing">
     <maven>
       <arg value="-Dmaven.test.skip=true" />
+      <arg value="-o" />
+      <arg value="jar" />
     </maven>
   </target>
 
-  <target name="create-lib" unless="jars.present" depends="init"
+  <target name="download-libs" unless="jars.present" depends="init"
       description="creates the libraries">
     <maven>
-      <arg value="create-lib" />
+      <arg value="download-libs" />
     </maven>
   </target>
 
@@ -201,7 +226,7 @@
     description="locally installed"
     depends="dist-lite,m2-install" />
 
-  <target name="quick" depends="create-lib"
+  <target name="quick" depends="download-libs"
       description="make a distribution">
     <mkdir dir="${basedir}/target/classes/"/>
     <path id="classpath">

Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=489844&r1=489843&r2=489844
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Fri Dec 22 19:23:45 2006
@@ -62,7 +62,7 @@
 modules/security/project.xml,\
 modules/spring/project.xml,\
 modules/soapmonitor/project.xml,\
-modules/integration/project.xml,\
+#modules/integration/project.xml,\
 modules/saaj/project.xml,\
 modules/saaj-api/project.xml,\
 modules/jibx/project.xml,\

Modified: webservices/axis2/trunk/java/modules/saaj-api/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj-api/project.properties?view=diff&rev=489844&r1=489843&r2=489844
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj-api/project.properties (original)
+++ webservices/axis2/trunk/java/modules/saaj-api/project.properties Fri Dec 22 19:23:45 2006
@@ -15,4 +15,16 @@
 # -------------------------------------------------------------------
 
 maven.multiproject.type=jar
+
+# -------------------------------------------------------------------
+#                JUnit
+# -------------------------------------------------------------------
 maven.junit.jvmargs=-Djavax.xml.soap.MessageFactory=org.apache.axis2.saaj.MessageFactoryImpl
-Djavax.xml.soap.SOAPFactory=org.apache.axis2.saaj.SOAPFactoryImpl -Djavax.xml.soap.SOAPConnectionFactory=org.apache.axis2.saaj.SOAPConnectionFactoryImpl
+
+# -------------------------------------------------------------------
+#                Compile
+# -------------------------------------------------------------------
+maven.compile.optimize=false
+maven.compile.fork=true
+maven.compile.target=1.3
+maven.compile.source=1.3



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message