You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2010/07/06 19:29:58 UTC

svn commit: r960952 - in /ode/trunk/axis2-war: pom.xml src/main/assembly/bin.xml

Author: vanto
Date: Tue Jul  6 17:29:58 2010
New Revision: 960952

URL: http://svn.apache.org/viewvc?rev=960952&view=rev
Log:
fixing war packagin: wars are expected to include axis2 modules and axis2-admin.

Modified:
    ode/trunk/axis2-war/pom.xml
    ode/trunk/axis2-war/src/main/assembly/bin.xml

Modified: ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/pom.xml?rev=960952&r1=960951&r2=960952&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Tue Jul  6 17:29:58 2010
@@ -250,6 +250,35 @@
 
    <build>
      <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-dependency-plugin</artifactId>
+         <executions>
+           <execution>
+             <id>unpack-axis2-webapp</id>
+             <phase>package</phase>
+             <goals>
+               <goal>unpack</goal>
+             </goals>
+             <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.apache.axis2</groupId>
+                   <artifactId>axis2-webapp</artifactId>
+                   <version>${axis2.version}</version>
+                   <type>war</type>
+                   <overWrite>false</overWrite>
+                 </artifactItem>
+               </artifactItems>
+               <includes>axis2-web/**,WEB-INF/classes/org/**,WEB-INF/modules/*</includes>
+               <outputDirectory>${project.build.directory}/axis2-webapp</outputDirectory>
+               <overWriteReleases>false</overWriteReleases>
+               <overWriteSnapshots>false</overWriteSnapshots>
+             </configuration>
+           </execution>
+         </executions>
+        </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

Modified: ode/trunk/axis2-war/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/assembly/bin.xml?rev=960952&r1=960951&r2=960952&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/assembly/bin.xml (original)
+++ ode/trunk/axis2-war/src/main/assembly/bin.xml Tue Jul  6 17:29:58 2010
@@ -26,6 +26,10 @@
   </formats>
 
   <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/axis2-webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
 
     <fileSet>
       <directory>src/main/webapp</directory>
@@ -184,7 +188,6 @@
     <include>org.apache.axis2:mex:mar</include>
       </includes>
     </dependencySet>
-
   </dependencySets>
 
 </assembly>