Author: thomas.diesler(a)jboss.com Date: 2009-08-21 11:27:11 -0400 (Fri, 21 Aug 2009) New Revision: 92675 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/pom.xml Log: Enable functional testing for jbossmc Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-08-21 15:11:34 UTC (rev 92674) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-08-21 15:27:11 UTC (rev 92675) @@ -106,6 +106,39 @@ </plugins> </build> </profile> + + <!-- + Name: framework-jbossmc + Descr: Setup for JBossMC framework integration testing + --> + <profile> + <id>framework-jbossmc</id> + <activation> + <property> + <name>framework</name> + <value>jbossmc</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/test/osgi/jbossas/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi38/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi112/**</exclude> + <exclude>org/jboss/test/osgi/service/startlevel/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-08-21 15:27:11 UTC (rev 92675) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bootstrap xmlns="urn:jboss:bootstrap:1.0"> + + <url>jboss-osgi-framework.xml</url> + +</bootstrap> Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml 2009-08-21 15:27:11 UTC (rev 92675) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + $Id$ +--> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * Framework * + * * + ******************************** + --> + + <!-- The OSGi Framework Factory --> + <bean name="jboss.osgi:service=FrameworkFactory" class="org.jboss.osgi.jbossmc.framework.launch.FrameworkFactoryBean"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages.extra</key> + <value> + <!-- system --> + javax.xml.bind.annotation;version=2.1, + org.apache.xerces.dom;version=2.9, + + <!-- jboss-osgi --> + org.jboss.osgi.jmx;version=1.0, + org.jboss.osgi.jndi;version=1.0, + org.jboss.osgi.microcontainer;version=1.0, + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.logging;version=1.0, + org.jboss.osgi.spi.management;version=1.0, + org.jboss.osgi.spi.service;version=1.0, + org.jboss.osgi.spi.testing;version=1.0, + org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.xml;version=1.0, + + <!-- jboss --> + org.jboss.beans.metadata.plugins;version=2.0, + org.jboss.beans.metadata.plugins.builder;version=2.0, + org.jboss.beans.metadata.spi.builder;version=2.0, + org.jboss.beans.metadata.spi;version=2.0, + org.jboss.dependency.spi;version=2.0, + org.jboss.kernel.spi.dependency;version=2.0, + org.jboss.logging, + org.jboss.reflect.spi;version=2.0, + org.jboss.util.xml;version=2.2, + org.jboss.virtual, + org.jboss.virtual.plugins.registry, + org.jboss.virtual.plugins.context.jar, + org.jboss.virtual.plugins.vfs.helpers, + org.jboss.virtual.protocol, + org.jboss.xb.annotations;version=2.0, + org.jboss.xb.binding;version=2.0, + org.jboss.xb.binding.sunday.unmarshalling;version=2.0, + </value> + </entry> + </map> + </property> + <property name="plugins"> + <list elementClass="org.jboss.osgi.jbossmc.api.AbstractPlugin"> + <inject bean="jboss.osgi:plugin=AutoInstall"/> + </list> + </property> + </bean> + + <!-- + ******************************** + * * + * Framework Plugins * + * * + ******************************** + --> + + <bean name="jboss.osgi:plugin=AutoInstall" class="org.jboss.osgi.jbossmc.framework.plugins.AutoInstallPluginImpl"> + <property name="autoInstall"> + <list elementClass="java.net.URL"> + <value>${test.archive.directory}/bundles/org.osgi.compendium.jar</value> + </list> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>${test.archive.directory}/bundles/jboss-osgi-common.jar</value> + </list> + </property> + </bean> + +</deployment> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-framework.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-08-21 15:11:34 UTC (rev 92674) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/services/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-08-21 15:27:11 UTC (rev 92675) @@ -1 +1,2 @@ +org.jboss.osgi.jbossmc.framework.launch.FrameworkBootstrapProvider org.jboss.osgi.spi.framework.PropertiesBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-21 15:11:34 UTC (rev 92674) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-08-21 15:27:11 UTC (rev 92675) @@ -291,19 +291,6 @@ <scope>provided</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <!-- Minimal bootstrap testing --> - <include>org/jboss/test/osgi/framework/**</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> </profile> <!--