4:02 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-04-21 05:02:12 -0400 (Tue, 21 Apr 2009)
New Revision: 87611
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/package.html
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/MicrocontainerServiceImpl.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/package.html
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html
Modified:
projects/jboss-osgi/trunk/bundle/remotelog/.project
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/package.html
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java
Log:
Use interface for MicrocontainerService
Modified: projects/jboss-osgi/trunk/bundle/remotelog/.project
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/.project 2009-04-21 07:37:13 UTC (rev
87610)
+++ projects/jboss-osgi/trunk/bundle/remotelog/.project 2009-04-21 09:02:12 UTC (rev
87611)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-service-remlog</name>
+ <name>jboss-osgi-remotelog</name>
<comment></comment>
<projects>
</projects>
@@ -17,7 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-21 07:37:13 UTC (rev 87610)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-21 09:02:12 UTC (rev 87611)
@@ -19,11 +19,9 @@
<description>JBossOSGi</description>
<scm>
-
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo...
- </connection>
-
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec...
- </developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi/</url>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec...
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
</scm>
<!-- Modules -->
Modified:
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-21
07:37:13 UTC (rev 87610)
+++
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-21
09:02:12 UTC (rev 87611)
@@ -40,7 +40,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
<property name="systemContext"><inject
bean="jboss.osgi:service=Framework"
property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
<property name="kernel"><inject
bean="jboss.kernel:service=Kernel" /></property>
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-04-21
07:37:13 UTC (rev 87610)
+++
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-21
09:02:12 UTC (rev 87611)
@@ -63,7 +63,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
<property name="systemContext"><inject
bean="jboss.osgi:service=Framework"
property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
<property name="kernel"><inject
bean="jboss.kernel:service=Kernel" /></property>
Modified:
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-21
07:37:13 UTC (rev 87610)
+++
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-21
09:02:12 UTC (rev 87611)
@@ -39,7 +39,7 @@
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
- <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.MicrocontainerService">
+ <bean name="jboss.osgi:service=Microcontainer"
class="org.jboss.osgi.spi.service.microcontainer.internal.MicrocontainerServiceImpl">
<property name="systemContext"><inject
bean="jboss.osgi:service=Framework"
property="systemBundleContext"/></property>
<property name="mbeanServer"><inject bean="JMXKernel"
property="mbeanServer"/></property>
<property name="kernel"><inject
bean="jboss.kernel:service=Kernel" /></property>
Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/package.html
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/package.html 2009-04-21
07:37:13 UTC (rev 87610)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/package.html 2009-04-21
09:02:12 UTC (rev 87611)
@@ -1,5 +1,5 @@
<html>
<body>
-OSGi framework integration and bootstrap.
+Framework integration and bootstrap.
</body>
</html>
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/package.html
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/package.html
(rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/package.html 2009-04-21
09:02:12 UTC (rev 87611)
@@ -0,0 +1,5 @@
+<html>
+<body>
+Support classes for Bundle logging.
+</body>
+</html>
Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java 2009-04-21
07:37:13 UTC (rev 87610)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/MicrocontainerService.java 2009-04-21
09:02:12 UTC (rev 87611)
@@ -25,9 +25,7 @@
import javax.management.MBeanServer;
-import org.jboss.dependency.spi.ControllerContext;
import org.jboss.kernel.Kernel;
-import org.osgi.framework.BundleContext;
/**
* An OSGi Service the gives access to the Kernel and MBeanServer.
@@ -35,51 +33,20 @@
* @author thomas.diesler(a)jboss.com
* @since 23-Jan-2009
*/
-public class MicrocontainerService
+public interface MicrocontainerService
{
- private BundleContext systemContext;
- private MBeanServer mbeanServer;
- private Kernel kernel;
+ /**
+ * Get the Microcontainer Kernel
+ */
+ Kernel getKernel();
- /**
- * Register this bean as an OSGi service
- */
- public void create()
- {
- systemContext.registerService(MicrocontainerService.class.getName(), this, null);
- }
-
- public void setSystemContext(BundleContext bundleContext)
- {
- this.systemContext = bundleContext;
- }
+ /**
+ * Get MBeanServer
+ */
+ MBeanServer getMbeanServer();
- public void setKernel(Kernel kernel)
- {
- this.kernel = kernel;
- }
-
- public Kernel getKernel()
- {
- return kernel;
- }
-
- public MBeanServer getMbeanServer()
- {
- return mbeanServer;
- }
-
- public void setMbeanServer(MBeanServer server)
- {
- this.mbeanServer = server;
- }
-
- public Object getRegisteredBean(String beanName)
- {
- if (kernel == null)
- throw new IllegalArgumentException("Kernel cannot be null");
-
- ControllerContext context = kernel.getController().getInstalledContext(beanName);
- return context.getTarget();
- }
+ /**
+ * Get a registered bean from the Kernel.
+ */
+ Object getRegisteredBean(String beanName);
}
\ No newline at end of file
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/MicrocontainerServiceImpl.java
(rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/MicrocontainerServiceImpl.java 2009-04-21
09:02:12 UTC (rev 87611)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.service.microcontainer.internal;
+
+//$Id$
+
+import javax.management.MBeanServer;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.osgi.spi.service.microcontainer.MicrocontainerService;
+import org.osgi.framework.BundleContext;
+
+/**
+ * An OSGi Service the gives access to the Kernel and MBeanServer.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Jan-2009
+ */
+public class MicrocontainerServiceImpl implements MicrocontainerService
+{
+ private BundleContext systemContext;
+ private MBeanServer mbeanServer;
+ private Kernel kernel;
+
+ /**
+ * Register this bean as an OSGi service
+ */
+ public void create()
+ {
+ systemContext.registerService(MicrocontainerServiceImpl.class.getName(), this,
null);
+ }
+
+ public void setSystemContext(BundleContext bundleContext)
+ {
+ this.systemContext = bundleContext;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ this.kernel = kernel;
+ }
+
+ public Kernel getKernel()
+ {
+ return kernel;
+ }
+
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer server)
+ {
+ this.mbeanServer = server;
+ }
+
+ public Object getRegisteredBean(String beanName)
+ {
+ if (kernel == null)
+ throw new IllegalArgumentException("Kernel cannot be null");
+
+ ControllerContext context = kernel.getController().getInstalledContext(beanName);
+ return context.getTarget();
+ }
+}
\ No newline at end of file
Property changes on:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/internal/MicrocontainerServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/package.html
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/package.html
(rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/microcontainer/package.html 2009-04-21
09:02:12 UTC (rev 87611)
@@ -0,0 +1,5 @@
+<html>
+<body>
+Service that provides access to the Kernel and MBeanServer.
+</body>
+</html>
\ No newline at end of file
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html
(rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html 2009-04-21
09:02:12 UTC (rev 87611)
@@ -0,0 +1,5 @@
+<html>
+<body>
+A collection of SPI provided services.
+</body>
+</html>
\ No newline at end of file