Author: dkulp
Date: Wed Mar 5 18:20:42 2008
New Revision: 634122
URL: http://svn.apache.org/viewvc?rev=634122&view=rev
Log:
Merged revisions 634117 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r634117 | dkulp | 2008-03-05 20:50:57 -0500 (Wed, 05 Mar 2008) | 2 lines
Fix to get working with latest assembly plugin
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml?rev=634122&r1=634121&r2=634122&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/bin.xml
Wed Mar 5 18:20:42 2008
@@ -99,14 +99,14 @@
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
<includes>
- <include>cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest-incubator.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>manifest/target</directory>
<outputDirectory>apache-cxf-${cxf.version}/modules</outputDirectory>
<includes>
- <include>cxf-manifest-incubator.jar</include>
+ <include>**/cxf-manifest-incubator.jar</include>
</includes>
</fileSet>
<fileSet>
@@ -159,7 +159,7 @@
<include>org.apache.cxf:cxf-bundle</include>
</includes>
<scope>runtime</scope>
-
<outputFileNameMapping>cxf-${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>cxf-${version}.jar</outputFileNameMapping>
</dependencySet>
</dependencySets>
