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/12/05 12:04:28 UTC
svn commit: r723711 - in
/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi: Analyzer.java
Builder.java Processor.java
Author: mcculls
Date: Fri Dec 5 03:04:26 2008
New Revision: 723711
URL: http://svn.apache.org/viewvc?rev=723711&view=rev
Log:
FELIX-843: commit temporary patch to local BND files
Modified:
felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Analyzer.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Processor.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=723711&r1=723710&r2=723711&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 Fri Dec 5 03:04:26 2008
@@ -164,7 +164,7 @@
}
exports = merge("export-package", exportInstructions, contained,
- superfluous.keySet());
+ superfluous.keySet(), null);
for (Iterator<Map.Entry<String, Map<String, String>>> i = superfluous
.entrySet().iterator(); i.hasNext();) {
@@ -196,7 +196,7 @@
// merge the info for matching packages
Set<String> extra = new TreeSet<String>(importInstructions.keySet());
imports = merge("import-package", importInstructions,
- referredAndExported, extra);
+ referredAndExported, extra, ignored);
// Instructions that have not been used could be superfluous
// or if they do not contain wildcards, should be added
@@ -621,13 +621,13 @@
if (bndInfo == null) {
bndInfo = new Properties();
try {
- InputStream in = getClass().getResourceAsStream("bnd.info");
+ InputStream in = Analyzer.class.getResourceAsStream("bnd.info");
if (in != null) {
bndInfo.load(in);
in.close();
}
} catch (IOException ioe) {
- warning("Could not read bnd.info in " + getClass().getPackage()
+ warning("Could not read bnd.info in " + Analyzer.class.getPackage()
+ ioe);
}
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java?rev=723711&r1=723710&r2=723711&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Builder.java Fri Dec 5 03:04:26 2008
@@ -266,7 +266,7 @@
// Private-Package
Map<String, Map<String, String>> filtered = merge(
CONDITIONAL_PACKAGE, conditionals, imports,
- new HashSet<String>());
+ new HashSet<String>(), null);
// Imports can also specify a private import. These
// packages must also be copied to the bundle
Modified: felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Processor.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Processor.java?rev=723711&r1=723710&r2=723711&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Processor.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/lib/osgi/Processor.java Fri Dec 5 03:04:26 2008
@@ -653,8 +653,9 @@
public static Map<String, Map<String, String>> merge(String type,
Map<String, Map<String, String>> instructions,
- Map<String, Map<String, String>> actual, Set<String> superfluous) {
- Map<String, Map<String, String>> ignored = newMap();
+ Map<String, Map<String, String>> actual,
+ Set<String> superfluous,
+ Map<String, Map<String,String>> ignored) {
Map<String, Map<String, String>> toVisit = new HashMap<String, Map<String, String>>(
actual); // we do not want to ruin our
// original
@@ -695,7 +696,7 @@
newAttributes.putAll(actual.get(packageName));
newAttributes.putAll(instructedAttributes);
result.put(packageName, newAttributes);
- } else {
+ } else if (ignored != null) {
ignored.put(packageName, new HashMap<String, String>());
}
p.remove(); // Can never match again for another pattern