[jboss-osgi-commits] JBoss-OSGI SVN: r87818 - in projects/jboss-osgi/trunk: microcontainer/osgi-int and 15 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-24 11:59:05 -0400 (Fri, 24 Apr 2009) New Revision: 87818 Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider Removed: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Remove dependencies on framework-config artefacts Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -11,6 +11,11 @@ <version>1.0.0.Beta2</version> </parent> + <!-- Properties --> + <properties> + <surefire.args>${surefire.args.root}</surefire.args> + </properties> + <dependencies> <!-- Global dependencies --> <dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -29,8 +29,8 @@ <module>microcontainer</module> <module>repository</module> <module>spi</module> - <module>bundle</module> <module>runtime</module> + <module>bundle</module> <module>testsuite</module> </modules> @@ -399,21 +399,6 @@ <profiles> <!-- - Name: default - Desc: The default profile - --> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory> - <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory> - </properties> - </profile> - - <!-- Name: distro Desc: Build the distribution --> @@ -434,39 +419,6 @@ </plugins> </build> </profile> - - <!-- - Name: eclipse - Desc: The eclipse profile - --> - <profile> - <id>eclipse</id> - <build> - <defaultGoal>process-test-resources</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <executions> - <execution> - <id>eclipse</id> - <phase>process-test-resources</phase> - <goals> - <goal>eclipse</goal> - </goals> - </execution> - </executions> - <configuration> - <downloadSources>true</downloadSources> - <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory> - </configuration> - </plugin> - </plugins> - </build> - <properties> - <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory> - <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory> - </properties> - </profile> </profiles> </project> Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,15 +0,0 @@ -<!-- - $Id$ ---> -<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"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ +<!-- + $Id$ +--> +<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"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -40,18 +40,6 @@ <artifactId>org.apache.felix.log</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-logging</artifactId> - <version>${version}</version> - <scope>provided</scope> - </dependency> <!-- Test Dependencies --> <dependency> Modified: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -16,8 +16,6 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:org.apache.felix.log:jar</include> - <include>*:jboss-osgi-common:jar</include> - <include>*:jboss-osgi-logging:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Deleted: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,49 +0,0 @@ -<!-- - $Id$ ---> -<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"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - <entry> - <key>org.osgi.framework.system.packages</key> - <value> - org.jboss.osgi.spi.logging, - org.osgi.framework; version=1.4, - org.osgi.service.log; version=1.3, - org.osgi.util.tracker; version=1.3, - - <!-- needed by jboss-remoting --> - javax.management, - javax.naming, - javax.net, - javax.net.ssl, - org.apache.log4j, - org.jboss.logging, - org.jboss.util, - org.jboss.util.id, - org.jboss.util.threadpool, - org.jboss.util.propertyeditor, - </value> - </entry> - <!-- - Setup remote logging - --> - <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> - </map> - </property> - <property name="autoStart"> - <list elementClass="java.net.URL"> - <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> - <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> - <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> - </list> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ +<!-- + $Id$ +--> +<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"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -1,15 +0,0 @@ -<!-- - $Id$ ---> -<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"> - - <!-- The OSGiFramework --> - <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - </map> - </property> - </bean> - -</deployment> Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -1 +0,0 @@ -org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,15 @@ +<!-- + $Id$ +--> +<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"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + +</deployment> Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (from rev 87644, projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider) =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrapProvider.java 2009-04-24 15:59:05 UTC (rev 87818) @@ -40,10 +40,6 @@ { /** The Framework bean name - jboss.osgi:service=Framework */ public static final String DEFAULT_FRAMEWORK_NAME = "jboss.osgi:service=Framework"; - /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ - public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; - /** The default framework beans: jboss-osgi-beans.xml */ - public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; /** * Get the OSGiFramework that registerd with the default name Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-04-24 15:59:05 UTC (rev 87818) @@ -42,6 +42,15 @@ */ public class MicrocontainerBootstrapProvider extends AbstractInstanceProvider implements OSGiBootstrapProvider { + /** The default framework beans property: org.jboss.osgi.default.framework.beans */ + public static final String DEFAULT_BOOTSTRAP_BEANS_PROP = "org.jboss.osgi.default.bootstrap.beans"; + /** The default framework beans: jboss-osgi-bootstrap-beans.xml */ + public static final String DEFAULT_BOOTSTRAP_BEANS = "jboss-osgi-bootstrap-beans.xml"; + /** The default framework beans property: org.jboss.osgi.default.framework.beans */ + public static final String DEFAULT_FRAMEWORK_BEANS_PROP = "org.jboss.osgi.default.framework.beans"; + /** The default framework beans: jboss-osgi-beans.xml */ + public static final String DEFAULT_FRAMEWORK_BEANS = "jboss-osgi-beans.xml"; + private EmbeddedBeansDeployer deployer = new EmbeddedBeansDeployer(); private boolean bootstraped; private boolean configured; @@ -56,7 +65,7 @@ OSGiFramework framework = getInstance(beanName, OSGiFramework.class); if (framework == null && configured == false) { - configure(DEFAULT_FRAMEWORK_BEANS); + configureWithDefaultBeans(); framework = getInstance(beanName, OSGiFramework.class); } return framework; @@ -64,9 +73,15 @@ public void configure() { - configure(DEFAULT_FRAMEWORK_BEANS); + configureWithDefaultBeans(); } + private void configureWithDefaultBeans() + { + String defaultFrameworkBeans = System.getProperty(DEFAULT_FRAMEWORK_BEANS_PROP, DEFAULT_FRAMEWORK_BEANS); + configure(defaultFrameworkBeans); + } + public void configure(InputStream streamConfig) { throw new NotImplementedException("Cannot bootstrap JBossMC from InputStream"); @@ -115,7 +130,8 @@ private void bootstrapKernel() { // Deploy the bootstrap beans if DEFAULT_BOOTSTRAP_BEANS is on the classpath - URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(DEFAULT_BOOTSTRAP_BEANS); + String defaultBootstrapBeans = System.getProperty(DEFAULT_BOOTSTRAP_BEANS_PROP, DEFAULT_BOOTSTRAP_BEANS); + URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(defaultBootstrapBeans); if (urlBootstrap != null) deployer.deploy(urlBootstrap); } Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -17,7 +17,6 @@ <!-- Properties --> <properties> - <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> <!-- Dependencies --> @@ -188,193 +187,6 @@ <!-- Profiles --> <profiles> - - <!-- - Name: framework-default - Descr: Setup for default framework integration testing - --> - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-felix - Descr: Setup for Felix framework integration testing - --> - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>!framework</name> - <value>felix</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>!framework</name> - <value>equinox</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-knopflerfish - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>!framework</name> - <value>knopflerfish</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: embedded-tesing - Descr: Setup for embedded integration testing - --> - <profile> - <id>embedded-tesing</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- Exclude tests that require remote access --> - <exclude>org/jboss/test/osgi/deployer/**</exclude> - <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: remote-tesing - Descr: Setup for remote integration testing - --> - <profile> - <id>remote-tesing</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- argLine>${surefire.security.args}</argLine --> - <excludes> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml (from rev 87644, projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml) =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,49 @@ +<!-- + $Id$ +--> +<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"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.jboss.osgi.spi.logging, + org.osgi.framework; version=1.4, + org.osgi.service.log; version=1.3, + org.osgi.util.tracker; version=1.3, + + <!-- needed by jboss-remoting --> + javax.management, + javax.naming, + javax.net, + javax.net.ssl, + org.apache.log4j, + org.jboss.logging, + org.jboss.util, + org.jboss.util.id, + org.jboss.util.threadpool, + org.jboss.util.propertyeditor, + </value> + </entry> + <!-- + Setup remote logging + --> + <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> + </map> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> + </list> + </property> + </bean> + +</deployment> Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -17,7 +17,6 @@ <!-- Properties --> <properties> - <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> <!-- Dependencies --> @@ -139,193 +138,8 @@ </plugins> </build> + <!-- Profiles --> <profiles> - - <!-- - Name: framework-default - Descr: Setup for default framework integration testing - --> - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-felix - Descr: Setup for Felix framework integration testing - --> - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>!framework</name> - <value>felix</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>!framework</name> - <value>equinox</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-knopflerfish - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>!framework</name> - <value>knopflerfish</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> - <version>${version}</version> - <classifier>config</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: embedded-tesing - Descr: Setup for embedded integration testing - --> - <profile> - <id>embedded-tesing</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- Exclude tests that require remote access --> - <exclude>org/jboss/test/osgi/deployer/**</exclude> - <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: remote-tesing - Descr: Setup for remote integration testing - --> - <profile> - <id>remote-tesing</id> - <activation> - <property> - <name>jboss.bind.address</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1,49 @@ +<!-- + $Id$ +--> +<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"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry> + <key>org.osgi.framework.system.packages</key> + <value> + org.jboss.osgi.spi.logging, + org.osgi.framework; version=1.4, + org.osgi.service.log; version=1.3, + org.osgi.util.tracker; version=1.3, + + <!-- needed by jboss-remoting --> + javax.management, + javax.naming, + javax.net, + javax.net.ssl, + org.apache.log4j, + org.jboss.logging, + org.jboss.util, + org.jboss.util.id, + org.jboss.util.threadpool, + org.jboss.util.propertyeditor, + </value> + </entry> + <!-- + Setup remote logging + --> + <entry><key>org.jboss.osgi.service.remote.log.reader</key><value>true</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> + <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> + </map> + </property> + <property name="autoStart"> + <list elementClass="java.net.URL"> + <value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value> + <value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value> + </list> + </property> + </bean> + +</deployment> Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/org.jboss.osgi.spi.framework.OSGiBootstrapProvider 2009-04-24 15:59:05 UTC (rev 87818) @@ -0,0 +1 @@ +org.jboss.osgi.spi.internal.MicrocontainerBootstrapProvider \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 15:37:29 UTC (rev 87817) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-24 15:59:05 UTC (rev 87818) @@ -20,4 +20,244 @@ <module>functional</module> </modules> + <!-- Profiles --> + <profiles> + + <!-- + Name: framework-default + Descr: Setup for default framework integration testing + --> + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-felix-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-felix + Descr: Setup for Felix framework integration testing + --> + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>!framework</name> + <value>felix</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-felix-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-equinox + Descr: Setup for Equinox framework integration testing + --> + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>!framework</name> + <value>equinox</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-equinox</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-equinox-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: framework-knopflerfish + Descr: Setup for Equinox framework integration testing + --> + <profile> + <id>framework-knopflerfish</id> + <activation> + <property> + <name>!framework</name> + <value>knopflerfish</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + <systemProperties> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> + </property> + <property> + <name>org.jboss.osgi.default.framework.beans</name> + <value>jboss-osgi-knopflerfish-beans.xml</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: embedded-tesing + Descr: Setup for embedded integration testing + --> + <profile> + <id>embedded-tesing</id> + <activation> + <property> + <name>!jboss.bind.address</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- Exclude tests that require remote access --> + <exclude>org/jboss/test/osgi/deployer/**</exclude> + <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: remote-tesing + Descr: Setup for remote integration testing + --> + <profile> + <id>remote-tesing</id> + <activation> + <property> + <name>jboss.bind.address</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-client</artifactId> + <scope>test</scope> + <type>pom</type> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>