felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r810634 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Date Wed, 02 Sep 2009 18:02:59 GMT
Author: mcculls
Date: Wed Sep  2 18:02:59 2009
New Revision: 810634

URL: http://svn.apache.org/viewvc?rev=810634&view=rev
Log:
FELIX-981: avoid spurious split package warnings

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=810634&r1=810633&r2=810634&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 Sep  2 18:02:59 2009
@@ -851,8 +851,8 @@
         properties.put( Analyzer.IMPORT_PACKAGE, "*" );
         properties.put( Analyzer.BUNDLE_VERSION, currentProject.getVersion() );
 
-        // remove the verbose Include-Resource entry from generated manifest
-        properties.put( Analyzer.REMOVE_HEADERS, Analyzer.INCLUDE_RESOURCE );
+        // remove the extraneous Include-Resource and Private-Package entries from generated
manifest
+        properties.put( Analyzer.REMOVE_HEADERS, Analyzer.INCLUDE_RESOURCE + ',' + Analyzer.PRIVATE_PACKAGE
);
 
         header( properties, Analyzer.BUNDLE_DESCRIPTION, currentProject.getDescription()
);
         StringBuffer licenseText = printLicenses( currentProject.getLicenses() );
@@ -934,7 +934,7 @@
             String pkg = ( String ) i.next();
 
             // mark all source packages as private by default (can be overridden by export
list)
-            privatePkgs.append( pkg ).append( ',' );
+            privatePkgs.append( pkg ).append( ";-split-package:=merge-first," );
 
             // we can't export the default package (".") and we shouldn't export internal
packages 
             if ( !( ".".equals( pkg ) || pkg.contains( ".internal" ) || pkg.contains( ".impl"
) ) )



Mime
View raw message