[jboss-cvs] JBossAS SVN: r91059 - in projects/jboss-osgi/trunk: testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA and 2 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-07-10 06:04:59 -0400 (Fri, 10 Jul 2009)
New Revision: 91059

Modified:
   projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java
Log:
Move MicrocontainerService to mc bundle

Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java	2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/container/AbstractManager.java	2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_KERNEL_CONTROLLER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL_CONTROLLER;
 
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.dependency.spi.ControllerContext;
@@ -31,7 +31,7 @@
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.osgi.blueprint.BlueprintContext;
 import org.jboss.osgi.blueprint.reflect.ComponentMetadataImpl;
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java	2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/bundleA/SomeService.java	2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
 import org.jboss.test.osgi.example.microcontainer.bundleB.SomeBean;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java	2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java	2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,12 +23,12 @@
 
 //$Id$
 
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_KERNEL;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_MBEAN_SERVER;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
 import static org.jboss.osgi.spi.management.ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK;
 import static org.jboss.osgi.spi.management.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
 import static org.jboss.osgi.spi.service.DeployerService.MBEAN_DEPLOYER_SERVICE;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_KERNEL;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_MBEAN_SERVER;
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
 import static org.jboss.test.osgi.service.microcontainer.bundleB.SomeBeanMBean.MBEAN_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -41,11 +41,11 @@
 
 import org.jboss.osgi.jndi.JNDICapability;
 import org.jboss.osgi.microcontainer.MicrocontainerCapability;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
 import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
 import org.jboss.osgi.spi.service.DeployerService;
-import org.jboss.osgi.spi.service.MicrocontainerService;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java	2009-07-10 10:04:11 UTC (rev 91058)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java	2009-07-10 10:04:59 UTC (rev 91059)
@@ -23,9 +23,9 @@
 
 //$Id$
 
-import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
+import static org.jboss.osgi.microcontainer.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT;
 
-import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.microcontainer.MicrocontainerService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;