incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jus...@apache.org
Subject svn commit: r979292 - in /sling/trunk/launchpad: base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java builder/src/main/bundles/list.xml
Date Mon, 26 Jul 2010 14:09:18 GMT
Author: justin
Date: Mon Jul 26 14:09:18 2010
New Revision: 979292

URL: http://svn.apache.org/viewvc?rev=979292&view=rev
Log:
SLING-1611 - exposing the platform MBeanServer as a service in launchpad.base and adding the
aries bundles

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
    sling/trunk/launchpad/builder/src/main/bundles/list.xml

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=979292&r1=979291&r2=979292&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
Mon Jul 26 14:09:18 2010
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.management.ManagementFactory;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,6 +38,9 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Map.Entry;
 
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
 import org.apache.felix.framework.Felix;
 import org.apache.felix.framework.Logger;
 import org.apache.felix.framework.util.FelixConstants;
@@ -309,6 +313,11 @@ public class Sling implements BundleActi
         bundleContext.registerService(URLStreamHandlerService.class.getName(),
             contextHandler, props);
 
+        // register the platform MBeanServer
+        MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+        bundleContext.registerService(MBeanServer.class.getName(),
+                platformMBeanServer, null);
+
         // execute optional bundle startup tasks of an extension
         this.doStartBundle();
     }

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=979292&r1=979291&r2=979292&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Jul 26 14:09:18 2010
@@ -159,6 +159,17 @@
             <artifactId>org.apache.felix.http.whiteboard</artifactId>
             <version>2.0.4</version>
         </bundle>
+        
+        <bundle>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.api</artifactId>
+            <version>0.1-incubating</version>
+        </bundle>
+        <bundle>
+            <groupId>org.apache.aries.jmx</groupId>
+            <artifactId>org.apache.aries.jmx.core</artifactId>
+            <version>0.1-incubating</version>
+        </bundle>
     </startLevel>
     <startLevel level="1">
         <bundle>



Mime
View raw message