[jboss-osgi-commits] JBoss-OSGI SVN: r88068 - in projects/jboss-osgi/trunk/bundle: blueprint/scripts and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-30 09:51:38 -0400 (Thu, 30 Apr 2009) New Revision: 88068 Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd Removed: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml projects/jboss-osgi/trunk/bundle/pom.xml Log: Restructure mcservice test bundles Modified: projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml 2009-04-30 13:12:46 UTC (rev 88067) +++ projects/jboss-osgi/trunk/bundle/blueprint/scripts/antrun-test-jars.xml 2009-04-30 13:51:38 UTC (rev 88068) @@ -43,20 +43,12 @@ <!-- Please add alphabetically --> - <!-- jmx-test --> + <!-- jmx --> <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jmx-test.jar" files="${tests.resources.dir}/jmx/jmx-test.bnd" /> - <!-- mcservice-test --> - <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundle.jar" files="${tests.resources.dir}/mcservice/mcservice-bundle.bnd" /> - <jar jarfile="${tests.output.dir}/test-libs/mcservice-beans.jar"> - <fileset dir="${tests.classes.dir}"> - <include name="org/jboss/test/osgi/blueprint/mcservice/beans/SomeBean.class" /> - <include name="org/jboss/test/osgi/blueprint/mcservice/beans/SomeBeanMBean.class" /> - </fileset> - <fileset dir="${tests.resources.dir}/mcservice"> - <include name="META-INF/mcservice-jboss-beans.xml" /> - </fileset> - </jar> + <!-- mcservice --> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundleA.jar" files="${tests.resources.dir}/mcservice/mcservice-bundleA.bnd" /> + <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/mcservice-bundleB.jar" files="${tests.resources.dir}/mcservice/mcservice-bundleB.bnd" /> <!-- Please add alphabetically --> Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 13:12:46 UTC (rev 88067) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/MicrocontainerServiceTestCase.java 2009-04-30 13:51:38 UTC (rev 88068) @@ -92,18 +92,18 @@ public void testBundleDeployment() throws Exception { MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer()); - mcService.deploy(getTestArchiveURL("mcservice-bundle.jar")); + mcService.deploy(getTestArchiveURL("mcservice-bundleA.jar")); ManagedFrameworkMBean frameworkMBean = MBeanProxy.get(ManagedFrameworkMBean.class, MBEAN_MANAGED_FRAMEWORK, getMBeanServer()); Set<ObjectName> bundles = frameworkMBean.getBundles(); - assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundle") > 0); + assertTrue("Managed bundle registered", bundles.toString().indexOf("jboss.osgi:bundle=mcservice-bundleA") > 0); - mcService.undeploy(getTestArchiveURL("mcservice-bundle.jar")); + mcService.undeploy(getTestArchiveURL("mcservice-bundleA.jar")); } public void testBeansDeployment() throws Exception { - // MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer()); - // mcService.deploy(getTestArchiveURL("mcservice-beans.jar")); + MicrocontainerServiceMBean mcService = MBeanProxy.get(MicrocontainerServiceMBean.class, MBEAN_MICROCONTAINER_SERVICE, getMBeanServer()); +// mcService.deploy(getTestArchiveURL("mcservice-bundleB.jar")); } } \ No newline at end of file Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA (from rev 88047, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle) Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/ServiceActivator.java 2009-04-30 04:43:05 UTC (rev 88047) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/ServiceActivator.java 2009-04-30 13:51:38 UTC (rev 88068) @@ -19,7 +19,7 @@ * 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.blueprint.mcservice.bundle; +package org.jboss.test.osgi.blueprint.mcservice.bundleA; //$Id$ Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundle/SomeService.java 2009-04-30 04:43:05 UTC (rev 88047) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleA/SomeService.java 2009-04-30 13:51:38 UTC (rev 88068) @@ -19,7 +19,7 @@ * 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.blueprint.mcservice.bundle; +package org.jboss.test.osgi.blueprint.mcservice.bundleA; //$Id$ Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB (from rev 88047, projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans) Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/SomeBean.java 2009-04-30 04:43:05 UTC (rev 88047) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBean.java 2009-04-30 13:51:38 UTC (rev 88068) @@ -19,14 +19,14 @@ * 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.blueprint.mcservice.beans; +package org.jboss.test.osgi.blueprint.mcservice.bundleB; //$Id$ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.jboss.test.osgi.blueprint.mcservice.bundle.SomeService; +import org.jboss.test.osgi.blueprint.mcservice.bundleA.SomeService; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/beans/SomeBeanMBean.java 2009-04-30 04:43:05 UTC (rev 88047) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/mcservice/bundleB/SomeBeanMBean.java 2009-04-30 13:51:38 UTC (rev 88068) @@ -19,7 +19,7 @@ * 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.blueprint.mcservice.beans; +package org.jboss.test.osgi.blueprint.mcservice.bundleB; //$Id$ Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml 2009-04-30 13:12:46 UTC (rev 88067) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/META-INF/mcservice-jboss-beans.xml 2009-04-30 13:51:38 UTC (rev 88068) @@ -1,6 +1,7 @@ <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.blueprint.mcservice.beans.SomeBean"> + <bean name="SomeBean" class="org.jboss.test.osgi.blueprint.mcservice.bundleB.SomeBean"> + <property name="mbeanServer"><inject bean="jboss.osgi:service=MBeanServer"/></property> </bean> </deployment> Deleted: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 13:12:46 UTC (rev 88067) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd 2009-04-30 13:51:38 UTC (rev 88068) @@ -1,8 +0,0 @@ -# bnd build -classpath target/test-classes -output target/test-libs/mcservice-bundle.jar src/test/resources/mcservice/mcservice-bundle.bnd - -Bundle-SymbolicName: mcservice-bundle -Bundle-Activator: org.jboss.test.osgi.blueprint.mcservice.bundle.ServiceActivator -Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundle -Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework - -#org.jboss.test.osgi.blueprint.mcservice.beans;resolution=optional Copied: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd (from rev 88067, projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundle.bnd) =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleA.bnd 2009-04-30 13:51:38 UTC (rev 88068) @@ -0,0 +1,6 @@ +# 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.blueprint.mcservice.bundleA.ServiceActivator +Export-Package: org.jboss.test.osgi.blueprint.mcservice.bundleA +Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework Added: projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd (rev 0) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/resources/mcservice/mcservice-bundleB.bnd 2009-04-30 13:51:38 UTC (rev 88068) @@ -0,0 +1,6 @@ +# 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.blueprint.mcservice.bundleB +Import-Package: javax.management, org.osgi.framework, org.jboss.test.osgi.blueprint.mcservice.bundleA +Include-Resource: META-INF/mcservice-jboss-beans.xml=META-INF/mcservice-jboss-beans.xml \ No newline at end of file Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 13:12:46 UTC (rev 88067) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-30 13:51:38 UTC (rev 88068) @@ -11,7 +11,7 @@ <version>1.0.0.Beta2</version> </parent> - <!-- Modules --> + <!-- Modules <modules> <module>blueprint</module> <module>common</module> @@ -21,12 +21,12 @@ <module>remotelog</module> <module>webconsole</module> </modules> + --> - <!-- + <!-- --> <modules> <module>blueprint</module> <module>microcontainer</module> </modules> - --> </project>