aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1222291 - in /aries/trunk/sandbox/jmx-next: jmx-api/src/main/java/org/osgi/jmx/framework/ jmx-api/src/main/java/org/osgi/jmx/framework/wiring/ jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/
Date Thu, 22 Dec 2011 15:49:59 GMT
Author: davidb
Date: Thu Dec 22 15:49:59 2011
New Revision: 1222291

URL: http://svn.apache.org/viewvc?rev=1222291&view=rev
Log:
Increase version to 1.7 and remove redundant constants from BundleWiringStateMBean.

Modified:
    aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java
    aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java
    aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java
    aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java

Modified: aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java?rev=1222291&r1=1222290&r2=1222291&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java
(original)
+++ aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/FrameworkMBean.java
Thu Dec 22 15:49:59 2011
@@ -38,7 +38,7 @@ public interface FrameworkMBean {
 	 * The fully qualified object name of this mbean.
 	 */
 	String			OBJECTNAME						= JmxConstants.OSGI_CORE
-															+ ":type=framework,version=1.5";
+															+ ":type=framework,version=1.7";
 
 	/**
 	 * The SUCCESS, used in {@link #SUCCESS_ITEM}.

Modified: aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java?rev=1222291&r1=1222290&r2=1222291&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java
(original)
+++ aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/ServiceStateMBean.java
Thu Dec 22 15:49:59 2011
@@ -40,7 +40,7 @@ public interface ServiceStateMBean {
 	 * The fully qualified object name of this mbean.
 	 */
 	String OBJECTNAME = JmxConstants.OSGI_CORE
-			+ ":type=serviceState,version=1.5";
+			+ ":type=serviceState,version=1.7";
 	/**
 	 * The key BUNDLE_IDENTIFIER, used in {@link #BUNDLE_IDENTIFIER_ITEM}.
 	 */

Modified: aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java?rev=1222291&r1=1222290&r2=1222291&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java
(original)
+++ aries/trunk/sandbox/jmx-next/jmx-api/src/main/java/org/osgi/jmx/framework/wiring/BundleWiringStateMBean.java
Thu Dec 22 15:49:59 2011
@@ -41,15 +41,12 @@ public interface BundleWiringStateMBean 
      * The Object Name for a Bundle Revisions MBean.
      */
     String OBJECTNAME = JmxConstants.OSGI_CORE
-        + ":type=wiringState,version=1.0";
+        + ":type=wiringState,version=1.7";
 
-    /*
-     * Namespaces
-     *
+    /**
+     * To be specified on any operation that takes a 'namespace' argument when results from
all namespaces are wanted.
      */
-    String BUNDLE_NAMESPACE = "osgi.wiring.bundle";
-    String HOST_NAMESPACE = "osgi.wiring.host";
-    String PACKAGE_NAMESPACE = "osgi.wiring.package";
+    String ALL_NAMESPACE = "osgi.wiring.all";
 
     /*
      * Items, CompositeData, TabularData, ArrayTypes
@@ -75,7 +72,6 @@ public interface BundleWiringStateMBean 
             "The directives of a capability or requirement",
             DIRECTIVES_TYPE);
 
-    // REVIEW should we reuse from JmxConstants here or create our own?
     TabularType ATTRIBUTES_TYPE = Item.tabularType("ATTRIBUTES",
             "Describes attributes of a capability or requirement",
             JmxConstants.PROPERTY_TYPE, JmxConstants.KEY

Modified: aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java?rev=1222291&r1=1222290&r2=1222291&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
(original)
+++ aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/framework/wiring/BundleWiringStateMBeanTest.java
Thu Dec 22 15:49:59 2011
@@ -125,7 +125,7 @@ public class BundleWiringStateMBeanTest 
         BundleRevision br = a.adapt(BundleRevision.class);
 
         List<BundleRequirement> requirements = br.getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
-        CompositeData[] jmxRequirements = brsMBean.getCurrentRevisionDeclaredRequirements(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        CompositeData[] jmxRequirements = brsMBean.getCurrentRevisionDeclaredRequirements(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
         Assert.assertEquals(requirements.size(), jmxRequirements.length);
 
         Map<Map<String, Object>, Map<String, String>> expectedRequirements
= requirementsToMap(requirements);
@@ -141,7 +141,7 @@ public class BundleWiringStateMBeanTest 
         BundleRevision br = a.adapt(BundleRevision.class);
 
         List<BundleCapability> capabilities = br.getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
-        CompositeData[] jmxCapabilities = brsMBean.getCurrentRevisionDeclaredCapabilities(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        CompositeData[] jmxCapabilities = brsMBean.getCurrentRevisionDeclaredCapabilities(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
         Assert.assertEquals(capabilities.size(), jmxCapabilities.length);
 
         Map<Map<String, Object>, Map<String, String>> expectedCapabilities
= capabilitiesToMap(capabilities);
@@ -158,7 +158,7 @@ public class BundleWiringStateMBeanTest 
 
         Assert.assertEquals("Precondition", 1, revisions.getRevisions().size());
 
-        TabularData jmxRequirementsTable = brsMBean.getRevisionsDeclaredRequirements(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        TabularData jmxRequirementsTable = brsMBean.getRevisionsDeclaredRequirements(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
         Assert.assertEquals(1, jmxRequirementsTable.size());
 
         List<BundleRequirement> requirements = revisions.getRevisions().iterator().next().getDeclaredRequirements(BundleRevision.PACKAGE_NAMESPACE);
@@ -179,7 +179,7 @@ public class BundleWiringStateMBeanTest 
 
         Assert.assertEquals("Precondition", 1, revisions.getRevisions().size());
 
-        TabularData jmxCapabilitiesTable = brsMBean.getRevisionsDeclaredCapabilities(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        TabularData jmxCapabilitiesTable = brsMBean.getRevisionsDeclaredCapabilities(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
         Assert.assertEquals(1, jmxCapabilitiesTable.size());
 
         List<BundleCapability> capabilities = revisions.getRevisions().iterator().next().getDeclaredCapabilities(BundleRevision.PACKAGE_NAMESPACE);
@@ -196,7 +196,7 @@ public class BundleWiringStateMBeanTest 
         BundleWiringStateMBean brsMBean = getMBean(BundleWiringStateMBean.OBJECTNAME, BundleWiringStateMBean.class);
 
         Bundle a = context().getBundleByName("org.apache.aries.jmx.test.bundlea");
-        CompositeData jmxWiring = brsMBean.getCurrentWiring(a.getBundleId(), BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        CompositeData jmxWiring = brsMBean.getCurrentWiring(a.getBundleId(), BundleRevision.PACKAGE_NAMESPACE);
 
         Assert.assertEquals(BundleWiringStateMBean.BUNDLE_WIRING_TYPE, jmxWiring.getCompositeType());
         Assert.assertEquals(a.getBundleId(), jmxWiring.get(BundleWiringStateMBean.BUNDLE_ID));
@@ -210,7 +210,7 @@ public class BundleWiringStateMBeanTest 
         BundleWiringStateMBean brsMBean = getMBean(BundleWiringStateMBean.OBJECTNAME, BundleWiringStateMBean.class);
 
         Bundle a = context().getBundleByName("org.apache.aries.jmx.test.bundlea");
-        TabularData jmxWiringTable = brsMBean.getRevisionsWiring(a.getBundleId(), BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        TabularData jmxWiringTable = brsMBean.getRevisionsWiring(a.getBundleId(), BundleRevision.PACKAGE_NAMESPACE);
 
         Assert.assertEquals(1, jmxWiringTable.size());
         CompositeData jmxWiring = (CompositeData) jmxWiringTable.values().iterator().next();
@@ -304,7 +304,7 @@ public class BundleWiringStateMBeanTest 
         BundleWiringStateMBean brsMBean = getMBean(BundleWiringStateMBean.OBJECTNAME, BundleWiringStateMBean.class);
 
         Bundle a = context().getBundleByName("org.apache.aries.jmx.test.bundlea");
-        TabularData jmxWiringClosure = brsMBean.getCurrentWiringClosure(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        TabularData jmxWiringClosure = brsMBean.getCurrentWiringClosure(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
 
         CompositeData jmxWiringA = jmxWiringClosure.get(new Object [] {a.getBundleId(), 0});
         assertBundleWiring(a.adapt(BundleWiring.class), jmxWiringA);
@@ -330,7 +330,7 @@ public class BundleWiringStateMBeanTest 
         BundleWiringStateMBean brsMBean = getMBean(BundleWiringStateMBean.OBJECTNAME, BundleWiringStateMBean.class);
 
         Bundle a = context().getBundleByName("org.apache.aries.jmx.test.bundlea");
-        TabularData jmxWiringClosure = brsMBean.getRevisionsWiringClosure(a.getBundleId(),
BundleWiringStateMBean.PACKAGE_NAMESPACE);
+        TabularData jmxWiringClosure = brsMBean.getRevisionsWiringClosure(a.getBundleId(),
BundleRevision.PACKAGE_NAMESPACE);
 
         CompositeData jmxWiringA = jmxWiringClosure.get(new Object [] {a.getBundleId(), 0});
         assertBundleWiring(a.adapt(BundleWiring.class), jmxWiringA);



Mime
View raw message