Author: veithen
Date: Sun Aug 1 18:09:50 2010
New Revision: 981278
URL: http://svn.apache.org/viewvc?rev=981278&view=rev
Log:
Fixed the packaging of the mex module so that it will be deployed as a MAR to
the Maven repository. This was not the case previously.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
axis/axis2/java/core/trunk/modules/mex/pom.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=981278&r1=981277&r2=981278&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 1 18:09:50
2010
@@ -129,6 +129,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<version>${pom.version}</version>
+ <type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml?rev=981278&r1=981277&r2=981278&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/repository.xml
Sun Aug 1 18:09:50 2010
@@ -32,15 +32,6 @@
<include>*:*:mar</include>
</includes>
</dependencySet>
- <dependencySet>
- <!-- TODO: mex is not available as a mar artifact; this is
obviously an issue -->
- <outputDirectory>modules</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.axis2:mex:jar</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}.mar</outputFileNameMapping>
- </dependencySet>
<!-- Add services to the repository -->
<dependencySet>
<outputDirectory>services</outputDirectory>
Modified: axis/axis2/java/core/trunk/modules/mex/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/pom.xml?rev=981278&r1=981277&r2=981278&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/mex/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/mex/pom.xml Sun Aug 1 18:09:50 2010
@@ -28,7 +28,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>mex</artifactId>
- <packaging>jar</packaging>
+ <packaging>mar</packaging>
<name>Apache Axis2 - MEX</name>
<description>WS-Metadata Exchange implementation</description>
<dependencies>
@@ -90,32 +90,35 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mar-maven-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>generate-mar</id>
- <phase>verify</phase>
+ <id>classpath-module</id>
<goals>
- <goal>mar</goal>
+ <goal>jar</goal>
</goals>
<configuration>
- <includeDependencies>false</includeDependencies>
+ <classifier>classpath-module</classifier>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- This JAR is used by Rampart; see AXIS2-3745 -->
+ <id>impl</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>impl</classifier>
+ <excludes>
+ <exclude>META-INF/module.xml</exclude>
+ </excludes>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>impl</classifier>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
