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 2009/01/29 14:05:13 UTC
svn commit: r738849 -
/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
Author: mcculls
Date: Thu Jan 29 13:05:13 2009
New Revision: 738849
URL: http://svn.apache.org/viewvc?rev=738849&view=rev
Log:
FELIX-807: apply suggested patch to Bnd
Modified:
felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
Modified: felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java?rev=738849&r1=738848&r2=738849&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java Thu Jan 29 13:05:13 2009
@@ -166,6 +166,9 @@
exports = merge("export-package", exportInstructions, contained,
superfluous.keySet(), null);
+ // disallow export of default package
+ exports.remove(".");
+
for (Iterator<Map.Entry<String, Map<String, String>>> i = superfluous
.entrySet().iterator(); i.hasNext();) {
// It is possible to mention metadata directories in the export
@@ -1619,7 +1622,7 @@
String pack = getPackage(relativePath);
if (pack != null && !contained.containsKey(pack)) {
- if (!(pack.equals(".") || isMetaData(relativePath))) {
+ if (!isMetaData(relativePath)) {
Map<String, String> map = new LinkedHashMap<String, String>();
contained.put(pack, map);