You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/12/06 23:32:57 UTC
svn commit: r1042826 - in
/axis/axis2/java/sandesha/trunk/modules/distribution: pom.xml
src/main/assembly/bin.xml
Author: veithen
Date: Mon Dec 6 22:32:56 2010
New Revision: 1042826
URL: http://svn.apache.org/viewvc?rev=1042826&view=rev
Log:
Use a dependencySet instead of a fileSet to include the JARs and the MAR into the binary distribution. Copying stuff from the target folder of sibling projects is a bad practice. Adding the other Maven modules as dependencies also eliminates the Javadoc warnings about missing packages.
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1042826&r1=1042825&r2=1042826&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Mon Dec 6 22:32:56 2010
@@ -43,6 +43,40 @@
<!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://axis.apache.org/axis2/java/sandesha/</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-client-constants</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-policy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-rampart-integration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-persistence</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml?rev=1042826&r1=1042825&r2=1042826&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml Mon Dec 6 22:32:56 2010
@@ -36,49 +36,6 @@
</fileSet>
<fileSet>
- <directory>../../modules/core/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-core-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/client/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-client-constants-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/policy/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-policy-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/rampart-integration/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-rampart-integration-${version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../../modules/persistence/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-persistence-${version}.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>../../modules/mar/target</directory>
- <outputDirectory>sandesha2-${version}-bin</outputDirectory>
- <includes>
- <include>sandesha2-${version}.mar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../../xdocs</directory>
<outputDirectory>sandesha2-${version}-bin/docs</outputDirectory>
<includes>
@@ -143,4 +100,17 @@
</includes>
</fileSet>
</fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>sandesha2-${version}-bin</outputDirectory>
+ <includes>
+ <include>org.apache.sandesha2:sandesha2-core</include>
+ <include>org.apache.sandesha2:sandesha2-client-constants</include>
+ <include>org.apache.sandesha2:sandesha2-policy</include>
+ <include>org.apache.sandesha2:sandesha2-rampart-integration</include>
+ <include>org.apache.sandesha2:sandesha2-persistence</include>
+ <include>org.apache.sandesha2:sandesha2</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>