You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2008/01/30 10:56:31 UTC
svn commit: r616703 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Author: mcculls
Date: Wed Jan 30 01:56:30 2008
New Revision: 616703
URL: http://svn.apache.org/viewvc?rev=616703&view=rev
Log:
Fix trigger of default Export-Package setting to also consider included property files
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.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=616703&r1=616702&r2=616703&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 Wed Jan 30 01:56:30 2008
@@ -328,13 +328,6 @@
Jar[] classpath ) throws Exception
{
properties.putAll( getDefaultProperties( currentProject ) );
-
- String bsn = currentProject.getGroupId() + "." + currentProject.getArtifactId();
- if ( !originalInstructions.containsKey( Analyzer.PRIVATE_PACKAGE ) )
- {
- properties.put( Analyzer.EXPORT_PACKAGE, bsn + ".*" );
- }
-
properties.putAll( transformDirectives( originalInstructions ) );
// update BND instructions to add Maven resources
@@ -344,6 +337,12 @@
builder.setBase( currentProject.getBasedir() );
builder.setProperties( properties );
builder.setClasspath( classpath );
+
+ if ( !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
+ {
+ String bsn = currentProject.getGroupId() + "." + currentProject.getArtifactId();
+ properties.put( Analyzer.EXPORT_PACKAGE, bsn + ".*" );
+ }
// update BND instructions to embed selected Maven dependencies
Collection embeddableArtifacts = getEmbeddableArtifacts( currentProject, properties );