You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2011/10/09 13:16:12 UTC
svn commit: r1180586 - in /webservices/axiom/branches/osgi-redesign: ./
modules/axiom-all/ modules/axiom-all/pom.xml pom.xml
src/main/assembly/bin.xml src/main/assembly/jar.xml
Author: veithen
Date: Sun Oct 9 11:16:12 2011
New Revision: 1180586
URL: http://svn.apache.org/viewvc?rev=1180586&view=rev
Log:
Merged latest changes from trunk.
Added:
webservices/axiom/branches/osgi-redesign/modules/axiom-all/ (props changed)
- copied from r1180584, webservices/commons/trunk/modules/axiom/modules/axiom-all/
webservices/axiom/branches/osgi-redesign/modules/axiom-all/pom.xml
- copied unchanged from r1180584, webservices/commons/trunk/modules/axiom/modules/axiom-all/pom.xml
Removed:
webservices/axiom/branches/osgi-redesign/src/main/assembly/jar.xml
Modified:
webservices/axiom/branches/osgi-redesign/ (props changed)
webservices/axiom/branches/osgi-redesign/pom.xml
webservices/axiom/branches/osgi-redesign/src/main/assembly/bin.xml
Propchange: webservices/axiom/branches/osgi-redesign/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 9 11:16:12 2011
@@ -1 +1 @@
-/webservices/commons/trunk/modules/axiom:1180368-1180410
+/webservices/commons/trunk/modules/axiom:1180368-1180584
Propchange: webservices/axiom/branches/osgi-redesign/modules/axiom-all/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 9 11:16:12 2011
@@ -0,0 +1 @@
+target
Modified: webservices/axiom/branches/osgi-redesign/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/osgi-redesign/pom.xml?rev=1180586&r1=1180585&r2=1180586&view=diff
==============================================================================
--- webservices/axiom/branches/osgi-redesign/pom.xml (original)
+++ webservices/axiom/branches/osgi-redesign/pom.xml Sun Oct 9 11:16:12 2011
@@ -470,21 +470,6 @@
<version>2.2-beta-5</version>
<executions>
<execution>
- <id>all-in-one-jar</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jar.xml</descriptor>
- </descriptors>
- <attach>false</attach>
- <finalName>axiom</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- <execution>
<id>bin</id>
<phase>package</phase>
<goals>
@@ -542,5 +527,6 @@
<module>modules/axiom-tests</module>
<module>modules/axiom-osgi-tests</module>
<module>modules/axiom-integration</module>
+ <module>modules/axiom-all</module>
</modules>
</project>
Modified: webservices/axiom/branches/osgi-redesign/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/osgi-redesign/src/main/assembly/bin.xml?rev=1180586&r1=1180585&r2=1180586&view=diff
==============================================================================
--- webservices/axiom/branches/osgi-redesign/src/main/assembly/bin.xml (original)
+++ webservices/axiom/branches/osgi-redesign/src/main/assembly/bin.xml Sun Oct 9 11:16:12 2011
@@ -70,11 +70,6 @@
<filtered>true</filtered>
<fileMode>0644</fileMode>
</file>
- <file>
- <source>${project.build.directory}/axiom.jar</source>
- <outputDirectory>/</outputDirectory>
- <destName>axiom.jar</destName>
- </file>
</files>
<moduleSets>
<moduleSet>
@@ -114,5 +109,16 @@
</dependencySets>
</binaries>
</moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.apache.ws.commons.axiom:axiom-all</include>
+ </includes>
+ <binaries>
+ <outputDirectory>/</outputDirectory>
+ <unpack>false</unpack>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>axiom.jar</outputFileNameMapping>
+ </binaries>
+ </moduleSet>
</moduleSets>
</assembly>