Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 80665 invoked from network); 25 Mar 2008 18:21:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Mar 2008 18:21:37 -0000 Received: (qmail 96121 invoked by uid 500); 25 Mar 2008 18:21:36 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 96075 invoked by uid 500); 25 Mar 2008 18:21:35 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 96066 invoked by uid 99); 25 Mar 2008 18:21:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2008 11:21:35 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2008 18:21:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 61A971A9832; Tue, 25 Mar 2008 11:21:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r640928 - in /incubator/cxf/branches/2.0.x-fixes: ./ buildtools/src/main/java/org/apache/cxf/maven/CXFAllTransformer.java buildtools/src/main/java/org/apache/cxf/maven/PluginTransformer.java distribution/bundle/pom.xml Date: Tue, 25 Mar 2008 18:21:15 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080325182116.61A971A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ META-INF/tools-plugin.xml +