Author: thomas.diesler(a)jboss.com Date: 2009-06-02 07:19:21 -0400 (Tue, 02 Jun 2009) New Revision: 89662 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/ 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/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/ServiceActivator.java 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/bundleB/ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBean.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBeanMBean.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/mcservice-jboss-beans.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleB.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/startlevel.bnd Removed: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/service-startlevel.bnd Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java Log: Add MCService functional test Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-06-02 11:03:01 UTC (rev 89661) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-06-02 11:19:21 UTC (rev 89662) @@ -78,9 +78,13 @@ <!-- jbosgi41 --> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi41-bundleA.jar" files="${tests.resources.dir}/jbosgi41/jbosgi41-bundleA.bnd" /> - <!-- service-startlevel --> - <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/service-startlevel.jar" files="${tests.resources.dir}/service/startlevel/service-startlevel.bnd" /> + <!-- startlevel --> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/startlevel.jar" files="${tests.resources.dir}/service/startlevel/startlevel.bnd" /> + <!-- mcservice --> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/mcservice-bundleA.jar" files="${tests.resources.dir}/service/mcservice/mcservice-bundleA.bnd" /> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/mcservice-bundleB.jar" files="${tests.resources.dir}/service/mcservice/mcservice-bundleB.bnd" /> + <!-- Please add alphabetically --> </target> Added: 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 (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,128 @@ +/* + * 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.test.osgi.service.microcontainer; + +//$Id$ + +import static org.jboss.osgi.spi.management.ManagedFrameworkMBean.MBEAN_MANAGED_FRAMEWORK; +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.osgi.spi.service.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.List; +import java.util.Set; + +import javax.management.ObjectName; + +import org.jboss.osgi.spi.capability.JNDICapability; +import org.jboss.osgi.spi.capability.MicrocontainerCapability; +import org.jboss.osgi.spi.management.MBeanProxy; +import org.jboss.osgi.spi.management.ManagedFrameworkMBean; +import org.jboss.osgi.spi.service.DeployerService; +import org.jboss.osgi.spi.service.MicrocontainerServiceMBean; +import org.jboss.osgi.spi.testing.OSGiRuntime; +import org.jboss.osgi.spi.testing.OSGiTest; +import org.jboss.osgi.spi.testing.OSGiTestHelper; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * A test that checks {@link MicrocontainerService} functionality + * + * @author thomas.diesler(a)jboss.com + * @since 12-Feb-2009 + */ +public class MicrocontainerServiceTestCase extends OSGiTest +{ + private static OSGiRuntime runtime; + + @BeforeClass + public static void setUpClass() throws Exception + { + runtime = new OSGiTestHelper().getDefaultRuntime(); + runtime.addCapability(new JNDICapability()); + runtime.addCapability(new MicrocontainerCapability()); + } + + @AfterClass + public static void tearDownClass() throws Exception + { + runtime.shutdown(); + } + + @Test + public void testServiceAccess() throws Exception + { + MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, runtime.getMBeanServer()); + List<String> registeredBeans = mcService.getRegisteredBeans(); + assertTrue("BundleContext registered with MC", registeredBeans.contains(BEAN_SYSTEM_BUNDLE_CONTEXT)); + assertTrue("MBeanServer registered with MC", registeredBeans.contains(BEAN_MBEAN_SERVER)); + assertTrue("Kernel registered with MC", registeredBeans.contains(BEAN_KERNEL)); + } + + /** + * Test whether a bundle can be deployed through the {@link DeployerService} + */ + @Test + public void testBundleDeployment() throws Exception + { + DeployerService deployer = MBeanProxy.get(DeployerService.class, MBEAN_DEPLOYER_SERVICE, runtime.getMBeanServer()); + deployer.deploy(getTestArchiveURL("service/mcservice-bundleA.jar")); + + ManagedFrameworkMBean frameworkMBean = MBeanProxy.get(ManagedFrameworkMBean.class, MBEAN_MANAGED_FRAMEWORK, runtime.getMBeanServer()); + Set<ObjectName> bundles = frameworkMBean.getBundles(); + assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundleA") > 0); + + deployer.undeploy(getTestArchiveURL("service/mcservice-bundleA.jar")); + } + + /** + * Test whether a bundle that contains beans can be deployed through the {@link DeployerService} + */ + @Test + public void testBeansDeployment() throws Exception + { + MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, runtime.getMBeanServer()); + DeployerService deployer = MBeanProxy.get(DeployerService.class, MBEAN_DEPLOYER_SERVICE, runtime.getMBeanServer()); + + deployer.deploy(getTestArchiveURL("service/mcservice-bundleB.jar")); + + ManagedFrameworkMBean frameworkMBean = MBeanProxy.get(ManagedFrameworkMBean.class, MBEAN_MANAGED_FRAMEWORK, runtime.getMBeanServer()); + Set<ObjectName> bundles = frameworkMBean.getBundles(); + assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundleB") > 0); + + // Check whether the bean is registered + List<String> registeredBeans = mcService.getRegisteredBeans(); + assertTrue("SomeBean registered", registeredBeans.contains("SomeBean")); + + deployer.undeploy(getTestArchiveURL("service/mcservice-bundleB.jar")); + + // Check whether the bean is unregistered + registeredBeans = mcService.getRegisteredBeans(); + assertFalse("SomeBean unregistered", registeredBeans.contains("SomeBean")); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/MicrocontainerServiceTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/ServiceActivator.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/ServiceActivator.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,46 @@ +/* + * 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.test.osgi.service.microcontainer.bundleA; + +//$Id$ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * A Service Activator + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class ServiceActivator implements BundleActivator +{ + public void start(BundleContext context) + { + SomeService service = new SomeService(context); + context.registerService(SomeService.class.getName(), service, null); + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/ServiceActivator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: 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 (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,73 @@ +/* + * 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.test.osgi.service.microcontainer.bundleA; + +//$Id$ + +import static org.jboss.osgi.spi.service.MicrocontainerService.BEAN_SYSTEM_BUNDLE_CONTEXT; + +import org.jboss.osgi.spi.service.MicrocontainerService; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; + +/** + * A service that accesses the MicrocontainerService + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class SomeService +{ + private BundleContext context; + + public SomeService(BundleContext context) + { + this.context = context; + + MicrocontainerService mcService = getMicrocontainerService(); + BundleContext bundleContext = (BundleContext)mcService.getRegisteredBean(BEAN_SYSTEM_BUNDLE_CONTEXT); + if (bundleContext == null) + throw new IllegalStateException("No BundleContext as MC Bean"); + } + +// public String callSomeBean(String msg) +// { +// MicrocontainerService mcService = getMicrocontainerService(); +// SomeBean bean = (SomeBean)mcService.getRegisteredBean(SomeBean.class.getName()); +// return bean.echo(msg); +// } + + public String echo(String msg) + { + return msg; + } + + private MicrocontainerService getMicrocontainerService() + { + ServiceReference sref = context.getServiceReference(MicrocontainerService.class.getName()); + MicrocontainerService service = (MicrocontainerService)context.getService(sref); + if (service == null) + throw new IllegalStateException("No MicrocontainerService"); + + return service; + } +} Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleA/SomeService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBean.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBean.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,58 @@ +/* + * 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.test.osgi.service.microcontainer.bundleB; + +//$Id$ + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +/** + * An MC bean that accesses some OSGi service + * + * @author thomas.diesler(a)jboss.com + * @since 24-Apr-2009 + */ +public class SomeBean implements SomeBeanMBean +{ + private MBeanServer mbeanServer; + + public void setMbeanServer(MBeanServer server) + { + this.mbeanServer = server; + } + + public void create() throws Exception + { + mbeanServer.registerMBean(this, new ObjectName("jboss.osgi:bean=SomeBean")); + } + + public void destroy() throws Exception + { + mbeanServer.unregisterMBean(new ObjectName("jboss.osgi:bean=SomeBean")); + } + + public String echo(String msg) + { + return msg; + } +} Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBeanMBean.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBeanMBean.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBeanMBean.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,29 @@ +/* + * 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.test.osgi.service.microcontainer.bundleB; + +//$Id$ + +public interface SomeBeanMBean +{ + String echo(String msg); +} Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/bundleB/SomeBeanMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-06-02 11:03:01 UTC (rev 89661) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/StartLevelTestCase.java 2009-06-02 11:19:21 UTC (rev 89662) @@ -45,7 +45,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - OSGiBundle bundle = runtime.installBundle("service/service-startlevel.jar"); + OSGiBundle bundle = runtime.installBundle("service/startlevel.jar"); bundle.start(); assertEquals("Bundle active", Bundle.ACTIVE, bundle.getState()); Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/mcservice-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/mcservice-jboss-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/mcservice-jboss-beans.xml 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,8 @@ +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="SomeBean" class="org.jboss.test.osgi.service.microcontainer.bundleB.SomeBean"> + <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property> + </bean> + +</deployment> + Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/META-INF/mcservice-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,9 @@ +# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundleA.jar src/test/resources/mcservice/mcservice-bundleA.bnd + +Bundle-SymbolicName: mcservice-bundleA + +Bundle-Activator: org.jboss.test.osgi.service.microcontainer.bundleA.ServiceActivator + +Export-Package: org.jboss.test.osgi.service.microcontainer.bundleA + +Import-Package: org.jboss.osgi.spi.service, org.osgi.framework Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleB.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleB.bnd 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,10 @@ +# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundleB.jar src/test/resources/mcservice/mcservice-bundleB.bnd + +Bundle-SymbolicName: mcservice-bundleB + +Export-Package: org.jboss.test.osgi.service.microcontainer.bundleB + +Import-Package: javax.management + +Include-Resource: META-INF/mcservice-jboss-beans.xml=META-INF/mcservice-jboss-beans.xml +-removeheaders: Include-Resource Deleted: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/service-startlevel.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/service-startlevel.bnd 2009-06-02 11:03:01 UTC (rev 89661) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/service-startlevel.bnd 2009-06-02 11:19:21 UTC (rev 89662) @@ -1,5 +0,0 @@ -# bnd build -classpath target/test-classes -output target/test-libs/service/service-startlevel.jar src/test/resources/service/startlevel/service-startlevel.bnd - -Bundle-SymbolicName: service-startlevel -Bundle-Activator: org.jboss.test.osgi.service.startlevel.bundle.ServiceActivator -Export-Package: org.jboss.test.osgi.service.startlevel.bundle Copied: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/startlevel.bnd (from rev 89649, projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/service-startlevel.bnd) =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/startlevel.bnd (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/startlevel/startlevel.bnd 2009-06-02 11:19:21 UTC (rev 89662) @@ -0,0 +1,5 @@ +# bnd build -classpath target/test-classes -output target/test-libs/service/startlevel.jar src/test/resources/service/startlevel/startlevel.bnd + +Bundle-SymbolicName: service-startlevel +Bundle-Activator: org.jboss.test.osgi.service.startlevel.bundle.ServiceActivator +Export-Package: org.jboss.test.osgi.service.startlevel.bundle