Author: veithen
Date: Tue Jul 27 21:52:20 2010
New Revision: 979882
URL: http://svn.apache.org/viewvc?rev=979882&view=rev
Log:
Build the axis2.jar using maven-assembly-plugin instead of ant. This in
particular allows us to easily avoid multiple inclusions of the same file
(AXIS2-4113).
Added:
axis/axis2/java/core/trunk/src/
axis/axis2/java/core/trunk/src/main/
axis/axis2/java/core/trunk/src/main/assembly/
axis/axis2/java/core/trunk/src/main/assembly/jar.xml (with props)
Modified:
axis/axis2/java/core/trunk/modules/addressing/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/addressing/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/pom.xml?rev=979882&r1=979881&r2=979882&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/addressing/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/addressing/pom.xml Tue Jul 27 21:52:20
2010
@@ -88,6 +88,19 @@
<includeDependencies>false</includeDependencies>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>classpath-module</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=979882&r1=979881&r2=979882&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Jul 27 21:52:20 2010
@@ -31,6 +31,7 @@
<version>SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Axis2 - Root</name>
+ <inceptionYear>2004</inceptionYear>
<modules>
<module>modules/resource-bundle</module> <!-- Must be first in the
list! -->
<module>modules/adb</module>
@@ -144,50 +145,35 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
- <id>axis2-jar</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <mkdir dir="target/lib" />
- <jar
destfile="target/lib/axis2-${pom.version}.jar">
- <fileset
dir="modules/java2wsdl/target/classes" />
- <fileset
dir="modules/kernel/target/classes" />
- <fileset
dir="modules/addressing/target/classes" />
- <fileset
dir="modules/codegen/target/classes" />
- <fileset dir="modules/adb/target/classes"
/>
- <fileset
dir="modules/adb-codegen/target/classes" />
- <fileset
dir="modules/xmlbeans/target/classes" />
- <fileset
dir="modules/clustering/target/classes" />
- </jar>
- </tasks>
- </configuration>
<goals>
- <goal>run</goal>
+ <goal>process</goal>
</goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.axis2:axis2-resource-bundle:${pom.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <!-- Note: the pluginManagement in axis2-parent doesn't apply
here; thus
+ we need to specify the version if we want a predictable
build! -->
+ <version>2.2-beta-5</version>
<executions>
<execution>
- <id>axis2-jar-package</id>
<phase>package</phase>
<goals>
- <goal>attach-artifact</goal>
+ <goal>single</goal>
</goals>
<configuration>
- <artifacts>
- <artifact>
-
<file>target/lib/axis2-${pom.version}.jar</file>
- <type>jar</type>
- </artifact>
- </artifacts>
+ <descriptors>
+
<descriptor>src/main/assembly/jar.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
Added: axis/axis2/java/core/trunk/src/main/assembly/jar.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/main/assembly/jar.xml?rev=979882&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/src/main/assembly/jar.xml (added)
+++ axis/axis2/java/core/trunk/src/main/assembly/jar.xml Tue Jul 27 21:52:20
2010
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.apache.axis2:axis2-java2wsdl</include>
+ <include>org.apache.axis2:axis2-kernel</include>
+ <include>org.apache.axis2:axis2-codegen</include>
+ <include>org.apache.axis2:axis2-adb</include>
+ <include>org.apache.axis2:axis2-adb-codegen</include>
+ <include>org.apache.axis2:axis2-xmlbeans</include>
+ <include>org.apache.axis2:axis2-clustering</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>OSGI-INF/**</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <!-- Note that we can at most include a single module here
(because
+ of the module.xml file)! -->
+ <include>org.apache.axis2:addressing</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <useStrictFiltering>true</useStrictFiltering>
+ <attachmentClassifier>classpath-module</attachmentClassifier>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <!-- We must pay attention not to exclude module.xml
here! -->
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/maven/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Propchange: axis/axis2/java/core/trunk/src/main/assembly/jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
