Author: dkulp
Date: Tue Mar 25 11:21:12 2008
New Revision: 640928
URL: http://svn.apache.org/viewvc?rev=640928&view=rev
Log:
Merged revisions 640903 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r640903 | dkulp | 2008-03-25 13:24:11 -0400 (Tue, 25 Mar 2008) | 2 lines
Create a cxf-all.xml file at bundle time to make using the osgi stuff in smx
a little easier.
........
Added:
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
- copied unchanged from r640903,
incubator/cxf/trunk/buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java?rev=640928&r1=640927&r2=640928&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java
Tue Mar 25 11:21:12 2008
@@ -25,7 +25,6 @@
import java.util.jar.JarOutputStream;
import org.apache.maven.plugins.shade.resource.ResourceTransformer;
-import org.jdom.Attribute;
import org.jdom.Content;
import org.jdom.Document;
import org.jdom.Element;
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=640928&r1=640927&r2=640928&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Tue Mar 25
11:21:12 2008
@@ -307,6 +307,7 @@
<transformer
implementation="org.apache.cxf.maven.PluginTransformer">
<resource>META-INF/tools-plugin.xml</resource>
</transformer>
+ <transformer
implementation="org.apache.cxf.maven.CXFAllTransformer"/>
</transformers>
</configuration>
</execution>
