Author: mcculls
Date: Sat Feb 2 06:49:03 2008
New Revision: 617808
URL: http://svn.apache.org/viewvc?rev=617808&view=rev
Log:
Add check to avoid overwriting custom settings in certain situations
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=617808&r1=617807&r2=617808&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
Sat Feb 2 06:49:03 2008
@@ -338,7 +338,7 @@
builder.setProperties( properties );
builder.setClasspath( classpath );
- if ( !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
+ if ( !properties.containsKey( Analyzer.EXPORT_PACKAGE ) &&
!properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
{
String bsn = properties.getProperty( Analyzer.BUNDLE_SYMBOLICNAME
);
String namespace = bsn.replaceAll( "\\W", "." );