aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1229091 - in /aries/trunk/sandbox/jmx-next: jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java tck/org.osgi.test.cases.jmx.bnd.bnd
Date Mon, 09 Jan 2012 10:48:47 GMT
Author: davidb
Date: Mon Jan  9 10:48:47 2012
New Revision: 1229091

URL: http://svn.apache.org/viewvc?rev=1229091&view=rev
Log:
Change Object Name structure to follow this pattern:
  osgi.core:type=theType,version=1.7,framework=frameworkName,uuid=someUUID

Modified:
    aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java
    aries/trunk/sandbox/jmx-next/tck/org.osgi.test.cases.jmx.bnd.bnd

Modified: aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java?rev=1229091&r1=1229090&r2=1229091&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java
(original)
+++ aries/trunk/sandbox/jmx-next/jmx-core/src/main/java/org/apache/aries/jmx/util/ObjectNameUtils.java
Mon Jan  9 10:48:47 2012
@@ -24,7 +24,7 @@ public class ObjectNameUtils {
 
     public static String createFullObjectName(BundleContext context, String namePrefix) {
         return namePrefix +
-                ",uuid=" + context.getProperty(Constants.FRAMEWORK_UUID) +
-                ",framework=" + context.getBundle(0).getSymbolicName();
+                ",framework=" + context.getBundle(0).getSymbolicName() +
+                ",uuid=" + context.getProperty(Constants.FRAMEWORK_UUID);
     }
 }

Modified: aries/trunk/sandbox/jmx-next/tck/org.osgi.test.cases.jmx.bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/sandbox/jmx-next/tck/org.osgi.test.cases.jmx.bnd.bnd?rev=1229091&r1=1229090&r2=1229091&view=diff
==============================================================================
--- aries/trunk/sandbox/jmx-next/tck/org.osgi.test.cases.jmx.bnd.bnd (original)
+++ aries/trunk/sandbox/jmx-next/tck/org.osgi.test.cases.jmx.bnd.bnd Mon Jan  9 10:48:47 2012
@@ -14,19 +14,19 @@ Include-Resource                    = \
     org.osgi.test.support;          version=project, \
     org.osgi.jmx;                   version=project , \
     osgi.core;                      version=4.3     , \
-    osgi.enterprise;                version=4.2     , \
+    osgi.cmpn;                      version=4.2     , \
     ${junit}    
 
--runbundles                     = \
-    osgi.enterprise; version=latest     , \
+-runbundles                         = \
+    osgi.cmpn; version=latest, \
     org.apache.aries.impl.jmx; version=latest, \
     org.osgi.impl.service.useradmin; version=latest, \
     org.osgi.impl.service.log; version=latest, \
     org.osgi.impl.service.cm; version=latest, \
     org.osgi.impl.service.provisioning; version=latest, \
-    org.osgi.impl.bundle.servlet;       version=2.1
+    org.osgi.impl.bundle.servlet; version=2.1
 
--runproperties                  = ${runsecureproperties}
+-runproperties                      = ${runsecureproperties}
 
 Test-Cases                          = ${testcases}
 -signaturetest                      = \
@@ -39,5 +39,6 @@ Test-Cases                          = ${
             
 -runproperties = ${runproperties}, \
     ${p}.system.packages.extra="${junit.package}", \
-    ${p}.bundles="${uniq;${enterprise.companion.jar},${repo;org.apache.aries.impl.jmx}}"
+    ${p}.bundles="${uniq;${cmpn.companion.jar},${repo;org.apache.aries.impl.jmx}}"
 #   osgi.console=1111, \
+



Mime
View raw message