Modified manifest parser to creating capabilities and requirements for
bundle dependencies. (FELIX-28)
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@501998 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
index 7dbe50d..6b0ebee 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
@@ -108,7 +108,7 @@
Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE, m_bundleSymbolicName, false);
attrs[1] = new R4Attribute(
Constants.BUNDLE_VERSION_ATTRIBUTE, m_bundleVersion, false);
-// capList.add(new Capability(ICapability.MODULE_NAMESPACE, null, attrs));
+ capList.add(new Capability(ICapability.MODULE_NAMESPACE, null, attrs));
}
//
@@ -118,13 +118,7 @@
// Get exported packages from bundle manifest.
ICapability[] exportCaps = parseExportHeader(
(String) headerMap.get(Constants.EXPORT_PACKAGE));
-/*
-System.out.println("PARSED EXPORT CAPABILITIES:");
-for (int capIdx = 0; capIdx < exportCaps.length; capIdx++)
-{
- System.out.println(exportCaps[capIdx]);
-}
-*/
+
// Create non-duplicated export array.
dupeMap.clear();
for (int capIdx = 0; capIdx < exportCaps.length; capIdx++)
@@ -161,10 +155,9 @@
IRequirement[] bundleReq = parseRequireBundleHeader(
(String) headerMap.get(Constants.REQUIRE_BUNDLE));
-//System.out.println("PARSED BUNDLE REQUIREMENTS:");
for (int reqIdx = 0; reqIdx < bundleReq.length; reqIdx++)
{
-// reqList.add(bundleReq[reqIdx]);
+ reqList.add(bundleReq[reqIdx]);
}
//
@@ -174,13 +167,7 @@
// Get import packages from bundle manifest.
IRequirement[] importReqs = parseImportHeader(
(String) headerMap.get(Constants.IMPORT_PACKAGE));
-/*
-System.out.println("PARSED IMPORT REQUIREMENTS:");
-for (int reqIdx = 0; reqIdx < importReqs.length; reqIdx++)
-{
- System.out.println(importReqs[reqIdx]);
-}
-*/
+
// Create non-duplicated import array.
dupeMap.clear();
for (int reqIdx = 0; reqIdx < importReqs.length; reqIdx++)
@@ -218,13 +205,7 @@
// Get dynamic import packages from bundle manifest.
m_dynamicRequirements = parseImportHeader(
(String) headerMap.get(Constants.DYNAMICIMPORT_PACKAGE));
-/*
-System.out.println("PARSED DYNAMIC IMPORT REQUIREMENTS:");
-for (int reqIdx = 0; reqIdx < m_dynamicRequirements.length; reqIdx++)
-{
- System.out.println(m_dynamicRequirements[reqIdx]);
-}
-*/
+
// Dynamic imports can have duplicates, so just check for import
// of java.*.
for (int reqIdx = 0; reqIdx < m_dynamicRequirements.length; reqIdx++)