Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 11984 invoked from network); 1 Apr 2008 06:54:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2008 06:54:50 -0000 Received: (qmail 57233 invoked by uid 500); 1 Apr 2008 06:54:50 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 57177 invoked by uid 500); 1 Apr 2008 06:54:50 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 57168 invoked by uid 99); 1 Apr 2008 06:54:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Mar 2008 23:54:50 -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, 01 Apr 2008 06:54:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C48531A983A; Mon, 31 Mar 2008 23:54:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643300 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin: BundlePlugin.java DependencyEmbedder.java Date: Tue, 01 Apr 2008 06:54:27 -0000 To: commits@felix.apache.org From: mcculls@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080401065429.C48531A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcculls Date: Mon Mar 31 23:54:26 2008 New Revision: 643300 URL: http://svn.apache.org/viewvc?rev=643300&view=rev Log: FELIX-526: Prepend embedded dependencies before maven resources to avoid overwriting them Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=643300&r1=643299&r2=643300&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Mon Mar 31 23:54:26 2008 @@ -354,13 +354,13 @@ properties.putAll( getDefaultProperties( currentProject ) ); properties.putAll( transformDirectives( originalInstructions ) ); - // update BND instructions to add Maven resources - includeMavenResources( currentProject, properties, getLog() ); - Builder builder = new Builder(); builder.setBase( currentProject.getBasedir() ); builder.setProperties( properties ); builder.setClasspath( classpath ); + + // update BND instructions to add included Maven resources + includeMavenResources( currentProject, properties, getLog() ); if ( null != classifier && classifier.trim().length() > 0 ) { Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java?rev=643300&r1=643299&r2=643300&view=diff ============================================================================== --- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java (original) +++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java Mon Mar 31 23:54:26 2008 @@ -423,8 +423,16 @@ } else if ( mavenDependencies.length() > 0 ) { - // original behaviour: append dependencies to the instruction - properties.setProperty( directiveName, instruction + ',' + mavenDependencies ); + if ( Analyzer.INCLUDE_RESOURCE.equalsIgnoreCase( directiveName ) ) + { + // dependencies should be prepended so they can be overwritten by local resources + properties.setProperty( directiveName, mavenDependencies + ',' + instruction ); + } + else // Analyzer.BUNDLE_CLASSPATH + { + // for the classpath we want dependencies to be appended after local entries + properties.setProperty( directiveName, instruction + ',' + mavenDependencies ); + } } // otherwise leave instruction unchanged }