KARAF-1838 Adding old package mbean methods for compatibility

git-svn-id: https://svn.apache.org/repos/asf/karaf/trunk@1388114 13f79535-47bb-0310-9956-ffa450edef68

Author: cschneider

package/core/src/main/java/org/apache/karaf/packages/core/PackageRequirement.java

@@ -52,6 +52,10 @@ public boolean isResolveable() {
     }
 
     public String getPackageName() {
+        return getPackageName(filter);
+    }
+    
+    public static String getPackageName(String filter) {
         Matcher matcher = packagePattern.matcher(filter);
         matcher.matches();
         return matcher.group(1);

package/core/src/main/java/org/apache/karaf/packages/core/PackageService.java

@@ -16,12 +16,36 @@
  */
 package org.apache.karaf.packages.core;
 
+import java.util.List;
 import java.util.SortedMap;
 
 public interface PackageService {
 
+	/**
+	 * Gets the simplified package exports of a bundle. This does not show the 
+	 * package versions.
+	 * 
+	 * @param bundleId
+	 * @return
+	 */
+    List<String> getExports(long bundleId);
+
+    List<String> getImports(long bundleId);
+
+	/**
+	 * Gets a map of all exported packages with their version and the bundles that exprot them
+	 * The key is in the form packagename:version.
+	 * 
+	 * @return 
+	 */
     SortedMap<String, PackageVersion> getExports();
 
+    /**
+     * Gets a map of all package imports. 
+     * The key is the import filter.
+     *  
+     * @return
+     */
     SortedMap<String, PackageRequirement> getImports();
 
 }

package/core/src/main/java/org/apache/karaf/packages/core/PackagesMBean.java

@@ -16,6 +16,8 @@
  */
 package org.apache.karaf.packages.core;
 
+import java.util.List;
+
 import javax.management.openmbean.TabularData;
 
 /**
@@ -25,5 +27,6 @@ public interface PackagesMBean {
 
     TabularData getExports();
     TabularData getImports();
-
+    List<String> getExports(long bundleId);
+    List<String> getImports(long bundleId);
 }

package/core/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.apache.karaf.packages.core.internal;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
@@ -63,6 +64,7 @@ public SortedMap<String, PackageVersion> getExports() {
         return packageVersionMap;
     }
 
+    @Override
     public SortedMap<String, PackageRequirement> getImports() {
         Bundle[] bundles = bundleContext.getBundles();
         SortedMap<String, PackageRequirement> filterMap = new TreeMap<String, PackageRequirement>();
@@ -100,4 +102,33 @@ private boolean checkResolveAble(BundleRequirement req) {
         return false;
     }
 
+	@Override
+	public List<String> getExports(long bundleId) {
+		Bundle bundle = bundleContext.getBundle(bundleId);
+        BundleRevision rev = bundle.adapt(BundleRevision.class);
+        List<BundleCapability> caps = rev.getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
+        List<String> exports = new ArrayList<String>();
+        for (BundleCapability cap : caps) {
+            Map<String, Object> attr = cap.getAttributes();
+            String packageName = (String)attr.get(BundleRevision.PACKAGE_NAMESPACE);
+            exports.add(packageName);
+        }
+		return exports ;
+	}
+
+	@Override
+	public List<String> getImports(long bundleId) {
+		Bundle bundle = bundleContext.getBundle(bundleId);
+        BundleRevision rev = bundle.adapt(BundleRevision.class);
+        List<BundleRequirement> reqs = rev.getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
+        List<String> imports = new ArrayList<String>();
+        for (BundleRequirement req : reqs) {
+            Map<String, String> attr = req.getDirectives();
+            String filter = attr.get("filter");
+            String name = PackageRequirement.getPackageName(filter);
+            imports.add(name);
+        }
+		return imports;
+	}
+
 }

package/core/src/main/java/org/apache/karaf/packages/core/internal/Packages.java

@@ -16,6 +16,7 @@
  */
 package org.apache.karaf.packages.core.internal;
 
+import java.util.List;
 import java.util.SortedMap;
 
 import javax.management.NotCompliantMBeanException;
@@ -126,4 +127,15 @@ public TabularData getImports() {
         }
     }
 
+	@Override
+	public List<String> getExports(long bundleId) {
+		return packageService.getExports(bundleId);
+		
+	}
+
+	@Override
+	public List<String> getImports(long bundleId) {
+		return packageService.getImports(bundleId);
+	}
+
 }