[jboss-osgi-commits] JBoss-OSGI SVN: r100653 - in projects/jboss-osgi/projects/runtime/framework/trunk/src: test/java/org/jboss/test/osgi/service and 1 other directory.

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

Author: alesj
Date: 2010-02-06 09:33:57 -0500 (Sat, 06 Feb 2010)
New Revision: 100653

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java
Log:
[JBOSGI-141]; fix JMX's MDR usage.

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java	2010-02-06 14:17:53 UTC (rev 100652)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java	2010-02-06 14:33:57 UTC (rev 100653)
@@ -64,12 +64,12 @@
       }
    }
 
-   protected abstract class AbstractDictionary extends Dictionary<String, Object>
+   protected class ControllerContextDictionary extends Dictionary<String, Object>
    {
       private Map<Object, Object> map;
       private ControllerContext context;
 
-      protected AbstractDictionary(ControllerContext context)
+      protected ControllerContextDictionary(ControllerContext context)
       {
          this.context = context;
          this.map = new ConcurrentHashMap<Object, Object>(2);
@@ -77,7 +77,10 @@
          map.put(Constants.OBJECTCLASS, EMPTY);
       }
 
-      protected abstract Object getName(ControllerContext context);
+      protected Object getName(ControllerContext context)
+      {
+         return context.getName();
+      }
 
       public int size()
       {

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java	2010-02-06 14:17:53 UTC (rev 100652)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java	2010-02-06 14:33:57 UTC (rev 100653)
@@ -47,19 +47,6 @@
 
    public Dictionary<String, Object> getDictionary(ServiceControllerContext context)
    {
-      return null;
+      return new ControllerContextDictionary(context);
    }
-
-   private class JMXDictionary extends AbstractDictionary
-   {
-      private JMXDictionary(ServiceControllerContext context)
-      {
-         super(context);
-      }
-
-      protected Object getName(ControllerContext context)
-      {
-         return ServiceControllerContext.class.cast(context).getObjectName().getCanonicalName();
-      }
-   }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java	2010-02-06 14:17:53 UTC (rev 100652)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java	2010-02-06 14:33:57 UTC (rev 100653)
@@ -22,19 +22,12 @@
 package org.jboss.osgi.framework.bundle;
 
 import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.jboss.beans.info.spi.BeanInfo;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.kernel.spi.config.KernelConfigurator;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.reflect.spi.ClassInfo;
-import org.jboss.util.collection.Iterators;
-import org.osgi.framework.Constants;
 
 /**
  * Kernel dictionary factory.
@@ -58,18 +51,13 @@
       return new KernelDictionary(context);
    }
 
-   private class KernelDictionary extends AbstractDictionary
+   private class KernelDictionary extends ControllerContextDictionary
    {
       private KernelDictionary(KernelControllerContext context)
       {
          super(context);
       }
 
-      protected Object getName(ControllerContext context)
-      {
-         return KernelControllerContext.class.cast(context).getName();
-      }
-
       @Override
       protected ClassInfo getFromNullTarget(ControllerContext context)
       {

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java	2010-02-06 14:17:53 UTC (rev 100652)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java	2010-02-06 14:33:57 UTC (rev 100653)
@@ -89,7 +89,7 @@
          assertEquals(1, refs.length);
          ServiceReference ref = refs[0];
          assertEquals(bundle, ref.getBundle());
-         // assertEquals("test:service=A", ref.getProperty("bean.name")); // TODO - add JMX MDR describe action
+         assertEquals("test:service=A", ref.getProperty("bean.name"));
          Class<?> aClass = bundle.loadClass(A.class.getName());
          BundleContext bc = bundle.getBundleContext();
          assertNotNull(bc);