Author: veithen
Date: Sun Aug 22 14:43:04 2010
New Revision: 987913
URL: http://svn.apache.org/viewvc?rev=987913&view=rev
Log:
Fixed the WAR distribution.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=987913&r1=987912&r2=987913&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 22 14:43:04
2010
@@ -216,6 +216,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+
+ <!-- This is needed to build the WAR distribution -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
</dependencies>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/distribution</connection>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml?rev=987913&r1=987912&r2=987913&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
Sun Aug 22 14:43:04 2010
@@ -23,29 +23,25 @@
<formats>
<format>zip</format>
</formats>
-
- <fileSets>
- <fileSet>
- <directory>../../modules/webapp/target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.war</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/tmp-doc-distro/docs</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>README.txt</include>
- <include>release-notes.html</include>
- </includes>
- </fileSet>
- </fileSets>
- <moduleSets>
- <moduleSet>
-
<includes><include>org.apache.axis2:webapp</include></includes>
- </moduleSet>
- </moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.axis2:axis2-webapp</include>
+ </includes>
+ <outputFileNameMapping>axis2.war</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>README.txt</include>
+ <include>release-notes.html</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
