[jboss-osgi-commits] JBoss-OSGI SVN: r89547 - in projects/jboss-osgi/trunk: distribution/src/main/resources/installer and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-05-30 08:08:13 -0400 (Sat, 30 May 2009)
New Revision: 89547

Modified:
   projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/AbstractMicrocontainerService.java
   projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
   projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/integration/jbossas/src/main/java/org/jboss/osgi/jbossas/integration/MicrocontainerServiceBean.java
   projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
Log:
Prevent cannot find symbol symbol: constructor StandardMBean

Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/AbstractMicrocontainerService.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/AbstractMicrocontainerService.java	2009-05-30 11:53:38 UTC (rev 89546)
+++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/AbstractMicrocontainerService.java	2009-05-30 12:08:13 UTC (rev 89547)
@@ -62,7 +62,7 @@
  * @author thomas.diesler at jboss.com
  * @since 23-Jan-2009
  */
-public abstract class AbstractMicrocontainerService implements DeployerService, MicrocontainerService
+public abstract class AbstractMicrocontainerService implements DeployerService, MicrocontainerService, MicrocontainerServiceMBean
 {
    private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
    private Map<URL, String> contextMap = Collections.synchronizedMap(new HashMap<URL, String>());
@@ -221,8 +221,8 @@
       try
       {
          logDebug("Register MicrocontainerServiceMBean");
-         StandardMBean mbean = new StandardMBean(this, MicrocontainerServiceMBean.class);
-         mbeanServer.registerMBean(mbean, MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE);
+         StandardMBean mbean = new StandardMBean((MicrocontainerServiceMBean)this, MicrocontainerServiceMBean.class);
+         mbeanServer.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE);
       }
       catch (Exception ex)
       {

Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java	2009-05-30 11:53:38 UTC (rev 89546)
+++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java	2009-05-30 12:08:13 UTC (rev 89547)
@@ -33,7 +33,6 @@
 import org.jboss.osgi.common.log.LogServiceTracker;
 import org.jboss.osgi.common.service.DeployerService;
 import org.jboss.osgi.common.service.MicrocontainerService;
-import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean;
 import org.jboss.virtual.VFS;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -47,7 +46,7 @@
  * @author thomas.diesler at jboss.com
  * @since 23-Jan-2009
  */
-public class MicrocontainerServiceImpl extends AbstractMicrocontainerService implements MicrocontainerServiceMBean
+public class MicrocontainerServiceImpl extends AbstractMicrocontainerService
 {
    private BundleContext context;
    private EmbeddedBeansDeployer deployer;

Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-05-30 11:53:38 UTC (rev 89546)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml	2009-05-30 12:08:13 UTC (rev 89547)
@@ -272,8 +272,10 @@
       
       <!-- deployers/osgi.deployer -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+        <include name="jboss-osgi-common.jar" />
         <include name="jboss-osgi-deployers.jar" />
         <include name="jboss-osgi-integration-jbossas.jar" />
+        <include name="jboss-osgi-microcontainer.jar" />
         <include name="jboss-osgi-spi.jar" />
       </fileset>
       

Modified: projects/jboss-osgi/trunk/integration/jbossas/src/main/java/org/jboss/osgi/jbossas/integration/MicrocontainerServiceBean.java
===================================================================
--- projects/jboss-osgi/trunk/integration/jbossas/src/main/java/org/jboss/osgi/jbossas/integration/MicrocontainerServiceBean.java	2009-05-30 11:53:38 UTC (rev 89546)
+++ projects/jboss-osgi/trunk/integration/jbossas/src/main/java/org/jboss/osgi/jbossas/integration/MicrocontainerServiceBean.java	2009-05-30 12:08:13 UTC (rev 89547)
@@ -32,7 +32,6 @@
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.osgi.common.service.DeployerService;
 import org.jboss.osgi.common.service.MicrocontainerService;
-import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean;
 import org.jboss.osgi.microcontainer.internal.AbstractMicrocontainerService;
 import org.osgi.framework.BundleContext;
 
@@ -43,7 +42,7 @@
  * @author thomas.diesler at jboss.com
  * @since 05-May-2009
  */
-public class MicrocontainerServiceBean extends AbstractMicrocontainerService implements MicrocontainerServiceMBean
+public class MicrocontainerServiceBean extends AbstractMicrocontainerService
 {
    private static Logger log = Logger.getLogger(MicrocontainerServiceBean.class);
 

Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-30 11:53:38 UTC (rev 89546)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-05-30 12:08:13 UTC (rev 89547)
@@ -87,19 +87,19 @@
   -->
 
   <!-- A Service that gives access to the Microcontainer -->
-  <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.microcontainer.internal.MicrocontainerServiceBean">
+  <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.jbossas.integration.MicrocontainerServiceBean">
    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
    <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
    <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
   </bean>
 
   <!-- A Service that gives access to JNDI -->
-  <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jndi.internal.NamingServiceBean">
+  <bean name="jboss.osgi:service=Naming" class="org.jboss.osgi.jbossas.integration.NamingServiceBean">
    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
   </bean>
 
   <!-- A Service that gives access to the MBeanServer -->
-  <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jmx.internal.ManagementServiceBean">
+  <bean name="jboss.osgi:service=Management" class="org.jboss.osgi.jbossas.integration.ManagementServiceBean">
    <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="bundleContext"/></property>
    <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
   </bean>