[jboss-cvs] JBossAS SVN: r93685 - in projects/jboss-osgi/projects: bundles/jndi/trunk and 4 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-09-18 07:35:11 -0400 (Fri, 18 Sep 2009)
New Revision: 93685

Modified:
   projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
   projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
   projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
   projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
   projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
Log:
Remove JMX and JNDI support from runtime-jbossas

Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java	2009-09-18 11:35:11 UTC (rev 93685)
@@ -154,7 +154,7 @@
 
          try
          {
-            // Check if the RMIAdaptor is alrady bound
+            // Check if the RMIAdaptor is already bound
             iniCtx.lookup(rmiAdaptorPath);
          }
          catch (NamingException lookupEx)

Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml	2009-09-18 11:35:11 UTC (rev 93685)
@@ -91,6 +91,7 @@
               org.jboss.osgi.spi.util;version="1.0",
               org.jboss.util.naming, 
               org.jboss.util.threadpool, 
+              org.jnp.interfaces,
               org.osgi.framework, 
               org.osgi.service.log,
             </Import-Package>

Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java	2009-09-18 11:35:11 UTC (rev 93685)
@@ -41,8 +41,9 @@
    
    public void create()
    {
-      String implVersion = getClass().getPackage().getImplementationVersion();
-      log.info("OSGi Integration Equinox - " + implVersion);
+      // Log INFO about this implementation
+      log.info(getClass().getPackage().getImplementationTitle());
+      log.info(getClass().getPackage().getImplementationVersion());
 
       // Load the framework instance
       FrameworkFactory factory = ServiceLoader.loadService(FrameworkFactory.class);

Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java	2009-09-18 11:35:11 UTC (rev 93685)
@@ -42,8 +42,9 @@
    
    public void create()
    {
-      String implVersion = getClass().getPackage().getImplementationVersion();
-      log.info("OSGi Integration Felix - " + implVersion);
+      // Log INFO about this implementation
+      log.info(getClass().getPackage().getImplementationTitle());
+      log.info(getClass().getPackage().getImplementationVersion());
 
       // When a Felix instance is embedded in a host application,
       // the host application must inform the Felix instance that it is embedded

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/pom.xml	2009-09-18 11:35:11 UTC (rev 93685)
@@ -76,13 +76,11 @@
             http://jira.codehaus.org/browse/MDEP-175 
           -->
           <includeArtifactIds>
-            jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-jmx,jboss-osgi-jndi,jboss-osgi-microcontainer,jboss-osgi-xml-binding
+            jboss-osgi-apache-xerces,jboss-osgi-jaxb,jboss-osgi-microcontainer,jboss-osgi-xml-binding
           </includeArtifactIds>
           <includes>
             org/jboss/osgi/jaxb/*.class, 
             org/jboss/osgi/jbossxb/*.class, 
-            org/jboss/osgi/jmx/*.class, 
-            org/jboss/osgi/jndi/*.class, 
             org/jboss/osgi/microcontainer/integration/*.class,
             org/jboss/osgi/xml/*.class
           </includes>

Modified: projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java	2009-09-18 11:33:03 UTC (rev 93684)
+++ projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/MicrocontainerServiceBean.java	2009-09-18 11:35:11 UTC (rev 93685)
@@ -27,8 +27,6 @@
 import java.util.Properties;
 
 import javax.management.MBeanServer;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.dependency.KernelController;
@@ -91,15 +89,6 @@
       Kernel kernel = getKernel();
       KernelController controller = kernel.getController();
 
-      // Register the MBeanServer 
-      bundleContext.registerService(MBeanServer.class.getName(), mbeanServer, null);
-      log.debug("MBeanServer registered");
-      
-      // Register the InitialContext 
-      InitialContext initialContext = getInitialContext();
-      bundleContext.registerService(InitialContext.class.getName(), initialContext, null);
-      log.debug("InitialContext registered");
-      
       // Register the XMLBindingService 
       XMLBindingService xbService = new XMLBindingService(){};
       bundleContext.registerService(XMLBindingService.class.getName(), xbService, null);
@@ -131,16 +120,4 @@
    {
       unregisterMicrocontainerServiceMBean(mbeanServer);
    }
-
-   private InitialContext getInitialContext()
-   {
-      try
-      {
-         return new InitialContext();
-      }
-      catch (NamingException ex)
-      {
-         throw new IllegalStateException("Cannot register InitialContext", ex);
-      }
-   }
 }
\ No newline at end of file