[jboss-osgi-commits] JBoss-OSGI SVN: r93028 - in projects/jboss-osgi/projects/bundles/microcontainer/trunk: src/main/java/org/jboss/osgi/microcontainer and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-08-31 09:16:37 -0400 (Mon, 31 Aug 2009) New Revision: 93028 Removed: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java Log: Add support for MicrocontainerService to MCFramework Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-08-31 13:16:37 UTC (rev 93028) @@ -34,7 +34,6 @@ <properties> <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.9-SNAPSHOT</version.jboss.microcontainer> - <version.jboss.osgi.jmx>1.0.1-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.runtime.deployers>1.0.1-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> <version.osgi>r4v42-20090728</version.osgi> @@ -44,11 +43,6 @@ <dependencies> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jboss.osgi.xml.binding}</version> </dependency> @@ -95,9 +89,6 @@ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator> <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> - <Export-Package> - org.jboss.osgi.microcontainer;version=${version} - </Export-Package> <Private-Package> org.jboss.osgi.microcontainer.integration, org.jboss.osgi.microcontainer.internal Deleted: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-08-31 13:16:37 UTC (rev 93028) @@ -1,54 +0,0 @@ -/* - * 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.microcontainer; - -//$Id$ - -import org.jboss.osgi.jbossxb.XMLBindingCapability; -import org.jboss.osgi.jmx.JMXCapability; -import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the Microcontainer capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link MicrocontainerService} is already registered. - * - * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}. - * - * Installed bundles: jboss-osgi-microcontainer.jar - * - * @author thomas.diesler(a)jboss.com - * @since 05-May-2009 - */ -public class MicrocontainerCapability extends Capability -{ - public MicrocontainerCapability() - { - super(MicrocontainerService.class.getName()); - - addDependency(new JMXCapability()); - addDependency(new XMLBindingCapability()); - addBundle("bundles/jboss-osgi-microcontainer.jar"); - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerService.java 2009-08-31 13:16:37 UTC (rev 93028) @@ -1,72 +0,0 @@ -/* - * 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.microcontainer; - -//$Id$ - -import java.util.List; - -/** - * An OSGi Service the gives access to the Kernel and MBeanServer. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Jan-2009 - */ -public interface MicrocontainerService -{ - /* - * The name under which the system bundle context is registered: 'jboss.osgi:service=BundleContext' - */ - String BEAN_SYSTEM_BUNDLE_CONTEXT = "jboss.osgi:service=BundleContext"; - - /* - * The name under which the MBeanServer is registered: 'jboss.osgi:service=MBeanServer' - */ - String BEAN_MBEAN_SERVER = "jboss.osgi:service=MBeanServer"; - - /* - * The name under which the KernelController is registered: 'jboss.kernel:service=KernelController' - */ - String BEAN_KERNEL_CONTROLLER = "jboss.kernel:service=KernelController"; - - /* - * The name under which the Kernel is registered: 'jboss.kernel:service=Kernel' - */ - String BEAN_KERNEL = "jboss.kernel:service=Kernel"; - - /* - * Get the list of registered beans. - */ - List<String> getRegisteredBeans(); - - /* - * Get a registered bean from the Kernel. - * @return null if there is no bean registered under this name - */ - Object getRegisteredBean(String beanName); - - /* - * Get a registered bean from the Kernel. - * @return null if there is no bean registered under this name - */ - <T> T getRegisteredBean(Class<T> clazz, String beanName); -} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-08-31 13:16:37 UTC (rev 93028) @@ -48,11 +48,11 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.osgi.microcontainer.MicrocontainerService; import org.jboss.osgi.spi.Constants; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.DeployerService; import org.jboss.osgi.spi.service.DeploymentRegistryService; +import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.osgi.spi.util.BundleDeployment; import org.jboss.osgi.spi.util.BundleDeploymentFactory; import org.jboss.virtual.VFS; Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java 2009-08-31 13:16:37 UTC (rev 93028) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.microcontainer.MicrocontainerService; +import org.jboss.osgi.spi.service.MicrocontainerService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-08-31 13:15:45 UTC (rev 93027) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-08-31 13:16:37 UTC (rev 93028) @@ -36,10 +36,10 @@ import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.jbossxb.XMLBindingService; -import org.jboss.osgi.microcontainer.MicrocontainerService; import org.jboss.osgi.microcontainer.integration.AbstractMicrocontainerService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; import org.jboss.osgi.spi.service.DeployerService; +import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.virtual.VFS; import org.osgi.framework.BundleContext; import org.osgi.framework.Filter;