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 he...@apache.org on 2005/02/18 16:02:37 UTC

svn commit: r154312 - webservices/axis/trunk/java/maven.xml webservices/axis/trunk/java/modules/core/src/conf webservices/axis/trunk/java/modules/core/src/html

Author: hemapani
Date: Fri Feb 18 07:02:35 2005
New Revision: 154312

URL: http://svn.apache.org/viewcvs?view=rev&rev=154312
Log:
add the htmls and fix the war generation

Added:
    webservices/axis/trunk/java/modules/core/src/conf/
      - copied from r154258, webservices/axis/trunk/archive/java/scratch/prototype2/src/conf/
    webservices/axis/trunk/java/modules/core/src/html/
      - copied from r154258, webservices/axis/trunk/archive/java/scratch/prototype2/src/html/
Modified:
    webservices/axis/trunk/java/maven.xml

Modified: webservices/axis/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/maven.xml?view=diff&r1=154311&r2=154312
==============================================================================
--- webservices/axis/trunk/java/maven.xml (original)
+++ webservices/axis/trunk/java/maven.xml Fri Feb 18 07:02:35 2005
@@ -27,11 +27,11 @@
 		</goal>
 
 
-    <goal name="war" prereqs="jar">
+    <goal name="war" prereqs="multiproject:install"> 
         <!-- jar the test classes -->
         <mkdir dir="target"/>
-		<war destfile="target/axis2.war" webxml="src/conf/web.xml">
-		  <fileset dir="src/html"/>
+		<war destfile="target/axis2.war" webxml="modules/src/conf/web.xml">
+		  <fileset dir="modules/core/src/html"/>
 		  <lib dir="${maven.repo.local}/stax/jars/">
 		    <include name="stax-api-1.0.jar"/>
 		    <include name="stax-1.1.1-dev.jar"/>		    
@@ -60,17 +60,17 @@
 		  <lib dir="modules/samples/target/">
 		    <include name="axis2*.jar"/>
 		  </lib>  
-		<classes dir="src/conf">
+		<classes dir="modules/core/src/conf">
       		    <include name="*.properties"/>
 		</classes>
 		</war>
     </goal>
     
-    <goal name="war-withsamples" prereqs="jar">
+    <goal name="war-withsamples" prereqs="multiproject:install"> 
         <!-- jar the test classes -->
-                <war destfile="target/axis2.war" webxml="src/conf/web.xml">
-                  <fileset dir="src/html"/>
-                  <webinf dir="target/test-resources/samples"/>
+               <war destfile="target/axis2.war" webxml="modules/core/src/conf/web.xml">
+                  <fileset dir="modules/core/src/html"/>
+                  <webinf dir="modules/samples/target/test-resources/samples"/>
                   <lib dir="${maven.repo.local}/stax/jars/">
                     <include name="stax-api-1.0.jar"/>
                     <include name="stax-1.1.1-dev.jar"/>
@@ -99,7 +99,7 @@
 				  <lib dir="modules/samples/target/">
 				    <include name="axis2*.jar"/>
 				  </lib>  
-				<classes dir="src/conf">
+				<classes dir="modules/core/src/conf">
 		      		    <include name="*.properties"/>
 				</classes>
                 </war>