felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1064937 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Date Sat, 29 Jan 2011 01:26:36 GMT
Author: chirino
Date: Sat Jan 29 01:26:36 2011
New Revision: 1064937

URL: http://svn.apache.org/viewvc?rev=1064937&view=rev
Log:
Fixes FELIX-2811 : If <Private-Package>!*</Private-Package> is defined the all
packages should be exported by {local-packages}

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=1064937&r1=1064936&r2=1064937&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 Jan 29 01:26:36 2011
@@ -1012,6 +1012,8 @@ public class BundlePlugin extends Abstra
 
         StringBuffer exportedPkgs = new StringBuffer();
         StringBuffer privatePkgs = new StringBuffer();
+        
+        boolean noprivatePackages = "!*".equals(analyzer.getProperty( Analyzer.PRIVATE_PACKAGE
) );
 
         for ( Iterator i = packages.iterator(); i.hasNext(); )
         {
@@ -1021,7 +1023,7 @@ public class BundlePlugin extends Abstra
             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"
) ) )
+            if ( noprivatePackages || !( ".".equals( pkg ) || pkg.contains( ".internal" )
|| pkg.contains( ".impl" ) ) )
             {
                 if( exportedPkgs.length() > 0 )
                 {



Mime
View raw message