[jboss-osgi-commits] JBoss-OSGI SVN: r99283 - in projects/jboss-osgi/projects/bundles/jmx/trunk: src/main/java/org/jboss/osgi/jmx/internal and 1 other directory.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-01-12 08:57:21 -0500 (Tue, 12 Jan 2010)
New Revision: 99283

Modified:
   projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
   projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/RMIAdaptor.java
Log:
Add PackageAdmin.resolveBundles()

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml	2010-01-12 13:53:12 UTC (rev 99282)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml	2010-01-12 13:57:21 UTC (rev 99283)
@@ -41,7 +41,7 @@
   <properties>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
     <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
-    <version.jboss.osgi.spi>1.0.3.SP1</version.jboss.osgi.spi>
+    <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
     <version.osgi>4.2.0</version.osgi>
   </properties>
   

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java	2010-01-12 13:53:12 UTC (rev 99282)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java	2010-01-12 13:57:21 UTC (rev 99283)
@@ -94,7 +94,7 @@
    {
       ObjectName oname = null;
 
-      String namestr = DOMAIN_NAME + ":" + PROPERTY_SYMBOLIC_NAME + "=" + symbolicName + "," + PROPERTY_VERSION + "=" + version + ",*" ;
+      String namestr = DOMAIN_NAME + ":" + PROPERTY_SYMBOLIC_NAME + "=" + symbolicName + "," + PROPERTY_VERSION + "=" + version + ",*";
       Set<ObjectName> names = mbeanServer.queryNames(ObjectNameFactory.create(namestr), null);
 
       if (names.size() > 0)
@@ -194,29 +194,39 @@
 
    public void refreshPackages(ObjectName[] objectNames)
    {
+      Bundle[] bundleArr = getBundles(objectNames);
       ServiceReference sref = getBundleContext().getServiceReference(PackageAdmin.class.getName());
-      if (sref != null)
+      PackageAdmin service = (PackageAdmin)getBundleContext().getService(sref);
+      service.refreshPackages(bundleArr);
+   }
+
+   public boolean resolveBundles(ObjectName[] objectNames)
+   {
+      Bundle[] bundleArr = getBundles(objectNames);
+      ServiceReference sref = getBundleContext().getServiceReference(PackageAdmin.class.getName());
+      PackageAdmin service = (PackageAdmin)getBundleContext().getService(sref);
+      return service.resolveBundles(bundleArr);
+   }
+
+   private Bundle[] getBundles(ObjectName[] objectNames)
+   {
+      Bundle[] bundleArr = null;
+      if (objectNames != null)
       {
-         PackageAdmin service = (PackageAdmin)getBundleContext().getService(sref);
+         List<String> symbolicNames = new ArrayList<String>();
+         for (ObjectName oname : objectNames)
+            symbolicNames.add(oname.getKeyProperty(PROPERTY_SYMBOLIC_NAME));
 
-         Bundle[] bundleArr = null;
-         if (objectNames != null)
+         Set<Bundle> bundleSet = new HashSet<Bundle>();
+         for (Bundle bundle : getBundleContext().getBundles())
          {
-            List<String> symbolicNames = new ArrayList<String>();
-            for (ObjectName oname : objectNames)
-               symbolicNames.add(oname.getKeyProperty(PROPERTY_SYMBOLIC_NAME));
-
-            Set<Bundle> bundleSet = new HashSet<Bundle>();
-            for (Bundle bundle : getBundleContext().getBundles())
-            {
-               if (symbolicNames.contains(bundle.getSymbolicName()))
-                  bundleSet.add(bundle);
-            }
-            bundleArr = new Bundle[bundleSet.size()];
-            bundleSet.toArray(bundleArr);
+            if (symbolicNames.contains(bundle.getSymbolicName()))
+               bundleSet.add(bundle);
          }
-         service.refreshPackages(bundleArr);
+         bundleArr = new Bundle[bundleSet.size()];
+         bundleSet.toArray(bundleArr);
       }
+      return bundleArr;
    }
 
    public void start()

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/RMIAdaptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/RMIAdaptor.java	2010-01-12 13:53:12 UTC (rev 99282)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/RMIAdaptor.java	2010-01-12 13:57:21 UTC (rev 99283)
@@ -130,13 +130,13 @@
       return delegate.isRegistered(name);
    }
 
-   @SuppressWarnings("unchecked")
+   @SuppressWarnings({ "rawtypes" })
    public Set queryMBeans(ObjectName name, QueryExp query) throws IOException
    {
       return delegate.queryMBeans(name, query);
    }
 
-   @SuppressWarnings("unchecked")
+   @SuppressWarnings({ "rawtypes" })
    public Set queryNames(ObjectName name, QueryExp query) throws IOException
    {
       return delegate.queryNames(name, query);