[jboss-cvs] JBossAS SVN: r89449 - in projects/jboss-osgi/trunk: blueprint/testsuite and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 26 15:33:55 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-26 15:33:54 -0400 (Tue, 26 May 2009)
New Revision: 89449
Added:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties
Removed:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-framework.properties
Modified:
projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/husky/testsuite/.project
projects/jboss-osgi/trunk/husky/testsuite/pom.xml
projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
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/testing/HuskyCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/trailblazer/.settings/org.eclipse.jdt.core.prefs
Log:
Use default runtime for husky and blueprint tests
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-26 19:33:54 UTC (rev 89449)
@@ -45,13 +45,13 @@
<!-- Bundle Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-blueprint-impl</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-blueprint-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -66,17 +66,22 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jaxb</artifactId>
+ <artifactId>jboss-osgi-common-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-husky-harness</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-jmx</artifactId>
+ <artifactId>jboss-osgi-jaxb</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -86,12 +91,12 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-xml-binding</artifactId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common-core</artifactId>
+ <artifactId>jboss-osgi-xml-binding</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-26 19:33:54 UTC (rev 89449)
@@ -23,6 +23,7 @@
<include>*:jboss-osgi-jaxb:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-logging:jar</include>
+ <include>*:jboss-osgi-microcontainer:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -28,14 +28,18 @@
import org.jboss.osgi.husky.BridgeFactory;
import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.spi.testing.AbstractBundle;
+import org.jboss.osgi.spi.testing.BlueprintCapability;
+import org.jboss.osgi.spi.testing.HuskyCapability;
+import org.jboss.osgi.spi.testing.JMXCapability;
+import org.jboss.osgi.spi.testing.MicrocontainerCapability;
import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.spi.testing.OSGiTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.service.blueprint.context.BlueprintContext;
@@ -45,33 +49,42 @@
* @author thomas.diesler at jboss.com
* @since 13-May-2009
*/
-public class BlueprintContextTestCase
+public class BlueprintContextTestCase extends OSGiTest
{
@ProvideContext
public BundleContext context;
- private OSGiTestHelper helper;
private OSGiRuntime runtime;
+ private AbstractBundle bundle;
@Before
- public void setUp() throws BundleException
+ public void setUp() throws Exception
{
+ super.setUp();
+
if (context == null)
{
- helper = new OSGiTestHelper();
- runtime = helper.getEmbeddedRuntime();
+ runtime = getDefaultRuntime();
+ runtime.addCapability(new JMXCapability());
+ runtime.addCapability(new HuskyCapability());
+ runtime.addCapability(new MicrocontainerCapability());
+ runtime.addCapability(new BlueprintCapability());
- runtime.installBundle("context-basic.jar").start();
+ bundle = runtime.installBundle("context-basic.jar");
+ bundle.start();
}
}
@After
- public void tearDown()
+ public void tearDown() throws Exception
{
if (context == null)
{
+ bundle.uninstall();
runtime.shutdown();
}
+
+ super.tearDown();
}
@Test
Copied: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties (from rev 89423, projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties)
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties (rev 0)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -0,0 +1,39 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${test.archive.directory}/../osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# Framework bootdelegation
+# org.osgi.framework.bootdelegation=org.osgi.service.log
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.management, \
+ org.jboss.osgi.spi.testing, \
+ 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.osgi.framework; version\=1.4
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
+
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -1,40 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${test.archive.directory}/../osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Framework bootdelegation
-# org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.osgi.spi, \
- org.jboss.osgi.spi.testing, \
- org.osgi.framework; version\=1.4
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-husky-harness.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common-core.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-apache-xerces.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-jaxb.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-xml-binding.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-blueprint-impl.jar
-
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -31,6 +31,10 @@
org.jboss.osgi.service.remote.log.host=${jboss.bind.address}
org.jboss.osgi.service.remote.log.port=5400
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
+org.jboss.osgi.husky.runtime.connector.port=5401
+
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.jboss.logging, \
@@ -38,6 +42,7 @@
org.jboss.osgi.spi, \
org.jboss.osgi.spi.logging, \
org.jboss.osgi.spi.management, \
+ org.jboss.osgi.spi.testing, \
org.jboss.virtual, \
org.jboss.virtual.plugins.registry, \
org.jboss.virtual.plugins.context.jar, \
Modified: projects/jboss-osgi/trunk/husky/testsuite/.project
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/.project 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/husky/testsuite/.project 2009-05-26 19:33:54 UTC (rev 89449)
@@ -17,7 +17,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/trunk/husky/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-26 19:33:54 UTC (rev 89449)
@@ -116,75 +116,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
</plugins>
</build>
- <profiles>
-
- <!--
- Name: remote-tesing
- Descr: Setup for remote testing
- <profile>
- <id>remote-tesing</id>
- <activation>
- <property>
- <name>target.container</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.runtime.connector.host</name>
- <value>localhost</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.runtime.connector.port</name>
- <value>5401</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- -->
-
- </profiles>
-
-
</project>
Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -27,6 +27,7 @@
import org.jboss.osgi.husky.BridgeFactory;
import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.spi.testing.AbstractBundle;
import org.jboss.osgi.spi.testing.HuskyCapability;
import org.jboss.osgi.spi.testing.JMXCapability;
import org.jboss.osgi.spi.testing.OSGiRuntime;
@@ -49,28 +50,29 @@
@ProvideContext
public BundleContext context;
- private OSGiTestHelper helper;
private OSGiRuntime runtime;
+ private AbstractBundle bundle;
@Before
public void setUp() throws BundleException
{
if (context == null)
{
- helper = new OSGiTestHelper();
- runtime = helper.getEmbeddedRuntime();
+ runtime = new OSGiTestHelper().getDefaultRuntime();
runtime.addCapability(new JMXCapability());
runtime.addCapability(new HuskyCapability());
- runtime.installBundle("context-basic.jar").start();
+ bundle = runtime.installBundle("context-basic.jar");
+ bundle.start();
}
}
@After
- public void tearDown()
+ public void tearDown() throws BundleException
{
if (context == null)
{
+ bundle.uninstall();
runtime.shutdown();
}
}
Copied: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties (from rev 89409, projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-framework.properties)
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties (rev 0)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -0,0 +1,36 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${basedir}/target/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# Husky socket connector properties
+org.jboss.osgi.husky.runtime.connector.host=localhost
+org.jboss.osgi.husky.runtime.connector.port=5401
+
+# Framework bootdelegation
+# org.osgi.framework.bootdelegation=org.osgi.service.log
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.testing, \
+ org.osgi.framework; version\=1.4
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -1,36 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${basedir}/target/osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Husky socket connector properties
-org.jboss.osgi.husky.runtime.connector.host=localhost
-org.jboss.osgi.husky.runtime.connector.port=5401
-
-# Framework bootdelegation
-# org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.osgi.spi, \
- org.jboss.osgi.spi.testing, \
- org.osgi.framework; version\=1.4
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/pom.xml 2009-05-26 19:33:54 UTC (rev 89449)
@@ -24,13 +24,7 @@
<!-- Properties -->
<properties>
- <surefire.husky.invoker>-Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker</surefire.husky.invoker>
- <surefire.log4j.output.dir>-Dlog4j.output.dir=${project.build.directory}</surefire.log4j.output.dir>
- <surefire.protocol.handlers>-Djava.protocol.handler.pkgs=org.jboss.net.protocol\|org.jboss.virtual.protocol</surefire.protocol.handlers>
- <surefire.test.archive.dir>-Dtest.archive.directory=${project.build.directory}/test-libs</surefire.test.archive.dir>
<surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
- <surefire.xerces.parser.config>-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeAwareParserConfiguration</surefire.xerces.parser.config>
- <surefire.common.args>${surefire.husky.invoker} ${surefire.log4j.output.dir} ${surefire.protocol.handlers} ${surefire.test.archive.dir} ${surefire.xerces.parser.config}</surefire.common.args>
<version.aqute.bnd>0.0.323</version.aqute.bnd>
<version.equinox>3.4.2</version.equinox>
@@ -396,7 +390,6 @@
<configuration>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<failIfNoTests>false</failIfNoTests>
- <argLine>${surefire.common.args}</argLine>
</configuration>
</plugin>
</plugins>
@@ -481,8 +474,15 @@
<!-- DistributionManagement -->
<distributionManagement>
<!--
- Add this to your ~/.m2/settings.xml <servers> <server> <id>jbpm.dyndns.org</id> <username>yourname</username> <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
- <passphrase>yourpass</passphrase> </server> </servers>
+ Add this to your ~/.m2/settings.xml
+ <servers>
+ <server>
+ <id>jbpm.dyndns.org</id>
+ <username>yourname</username>
+ <privateKey>/home/yourname/.ssh/id_rsa</privateKey>
+ <passphrase>yourpass</passphrase>
+ </server>
+ </servers>
-->
<repository>
<id>repository.jboss.org</id>
@@ -557,6 +557,197 @@
</profile>
<!--
+ Name: framework-default
+ Descr: Setup for default framework integration testing
+ -->
+ <profile>
+ <id>framework-default</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ </property>
+ </activation>
+ <properties>
+ <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
+ </properties>
+ </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>
+ <properties>
+ <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
+ </properties>
+ </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>
+ <properties>
+ <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties>
+ </properties>
+ </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>
+ <properties>
+ <jboss.osgi.framework.properties>jboss-osgi-knopflerfish.properties</jboss.osgi.framework.properties>
+ </properties>
+ </profile>
+
+ <!--
+ Name: embedded-testing
+ Descr: Setup for embedded integration testing
+ -->
+ <profile>
+ <id>embedded-testing</id>
+ <activation>
+ <property>
+ <name>!target.container</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
+ <name>jndi.server.port</name>
+ <value>1199</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
+ <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
+ </property>
+ <property>
+ <name>jboss.osgi.framework.properties</name>
+ <value>${jboss.osgi.framework.properties}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: remote-testing
+ Descr: Setup for remote integration testing
+ -->
+ <profile>
+ <id>remote-testing</id>
+ <activation>
+ <property>
+ <name>target.container</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>
+ <systemProperties>
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
+ <name>jndi.server.port</name>
+ <value>1099</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${project.build.directory}</value>
+ </property>
+ <property>
+ <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
+ <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
+ </property>
+ <property>
+ <name>jboss.osgi.framework.properties</name>
+ <value>${jboss.osgi.framework.properties}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.runtime.connector.host</name>
+ <value>${jboss.bind.address}</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.runtime.connector.port</name>
+ <value>5401</value>
+ </property>
+ <property>
+ <name>target.container</name>
+ <value>${target.container}</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: jboss501
Descr: Setup for jboss501 integration testing
-->
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -81,6 +81,11 @@
*/
public class PropertiesBootstrapProvider implements OSGiBootstrapProvider
{
+ /** The default framework property: jboss.osgi.framework.properties */
+ public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.properties";
+ /** The default framework config: jboss-osgi-framework.properties */
+ public static final String DEFAULT_OSGI_FRAMEWORK_PROPERTIES = "jboss-osgi-framework.properties";
+
/** The OSGi framework integration class: org.jboss.osgi.spi.framework.impl */
public static final String PROP_OSGI_FRAMEWORK_IMPL = "org.jboss.osgi.spi.framework.impl";
/** The OSGi framework integration class: org.jboss.osgi.spi.framework.autoInstall */
@@ -96,15 +101,6 @@
internalProps.add(PROP_OSGI_FRAMEWORK_AUTO_START);
}
- /** The default framework beans property: jboss.osgi.bootstrap.config */
- public static final String OSGI_BOOTSTRAP_CONFIG = "jboss.osgi.bootstrap.config";
- /** The default framework beans: jboss-osgi-bootstrap-beans.xml */
- public static final String DEFAULT_OSGI_BOOTSTRAP_PROPERTIES = "jboss-osgi-bootstrap.properties";
- /** The default framework beans property: jboss.osgi.framework.config */
- public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.config";
- /** The default framework beans: jboss-osgi-beans.xml */
- public static final String DEFAULT_OSGI_FRAMEWORK_PROPERTIES = "jboss-osgi-framework.properties";
-
private OSGiFramework framework;
private boolean configured;
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-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/internal/MicrocontainerBootstrapProvider.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -42,12 +42,12 @@
*/
public class MicrocontainerBootstrapProvider extends AbstractInstanceProvider implements OSGiBootstrapProvider
{
- /** The default framework beans property: jboss.osgi.bootstrap.config */
- public static final String OSGI_BOOTSTRAP_CONFIG = "jboss.osgi.bootstrap.config";
+ /** The default framework beans property: jboss.osgi.bootstrap.beans */
+ public static final String OSGI_BOOTSTRAP_BEANS = "jboss.osgi.bootstrap.beans";
/** The default framework beans: jboss-osgi-bootstrap-beans.xml */
public static final String DEFAULT_OSGI_BOOTSTRAP_XML = "jboss-osgi-bootstrap-beans.xml";
- /** The default framework beans property: jboss.osgi.framework.config */
- public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.config";
+ /** The default framework beans property: jboss.osgi.framework.beans */
+ public static final String OSGI_FRAMEWORK_BEANS = "jboss.osgi.framework.beans";
/** The default framework beans: jboss-osgi-beans.xml */
public static final String DEFAULT_OSGI_FRAMEWORK_XML = "jboss-osgi-beans.xml";
@@ -123,14 +123,14 @@
private void configureWithDefaultBeans()
{
- String defaultFrameworkBeans = System.getProperty(OSGI_FRAMEWORK_CONFIG, DEFAULT_OSGI_FRAMEWORK_XML);
+ String defaultFrameworkBeans = System.getProperty(OSGI_FRAMEWORK_BEANS, DEFAULT_OSGI_FRAMEWORK_XML);
configure(defaultFrameworkBeans);
}
private void bootstrapKernel()
{
// Deploy the bootstrap beans if DEFAULT_BOOTSTRAP_BEANS is on the classpath
- String defaultBootstrapBeans = System.getProperty(OSGI_BOOTSTRAP_CONFIG, DEFAULT_OSGI_BOOTSTRAP_XML);
+ String defaultBootstrapBeans = System.getProperty(OSGI_BOOTSTRAP_BEANS, DEFAULT_OSGI_BOOTSTRAP_XML);
URL urlBootstrap = Thread.currentThread().getContextClassLoader().getResource(defaultBootstrapBeans);
if (urlBootstrap != null)
deployer.deploy(urlBootstrap);
Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -0,0 +1,40 @@
+/*
+ * 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.osgi.spi.testing;
+
+//$Id$
+
+
+
+/**
+ * [TODO]
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 05-May-2009
+ */
+public class BlueprintCapability extends Capability
+{
+ public BlueprintCapability()
+ {
+ addBundle("bundles/jboss-osgi-blueprint-impl.jar");
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -23,9 +23,6 @@
//$Id$
-import java.util.Properties;
-
-
/**
* [TODO]
*
@@ -36,10 +33,6 @@
{
public HuskyCapability()
{
- Properties props = getProperties();
- //props.setProperty("org.jboss.osgi.jmx.host", System.getProperty("jboss.bind.address", "localhost"));
- //props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198");
-
addBundle("bundles/jboss-osgi-husky-harness.jar");
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -36,6 +36,7 @@
{
addBundle("bundles/jboss-osgi-apache-xerces.jar");
addBundle("bundles/jboss-osgi-jaxb.jar");
+ addBundle("bundles/jboss-osgi-common-core.jar");
addBundle("bundles/jboss-osgi-xml-binding.jar");
addBundle("bundles/jboss-osgi-microcontainer.jar");
}
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -44,7 +44,7 @@
// Provide logging
final Logger log = Logger.getLogger(OSGiTest.class);
- private OSGiTestHelper helper;
+ private OSGiTestHelper helper = new OSGiTestHelper();
public OSGiTest()
{
@@ -56,7 +56,6 @@
public void setUp() throws Exception
{
log.debug("### START " + getLongName());
- helper = new OSGiTestHelper();
}
@After
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-26 19:33:54 UTC (rev 89449)
@@ -87,10 +87,13 @@
for (String location : capability.getBundles())
{
- AbstractBundle bundle = installBundle(location);
- bundle.start();
+ if (bundles.get(location) == null)
+ {
+ AbstractBundle bundle = installBundle(location);
+ bundle.start();
- bundles.put(location, bundle);
+ bundles.put(location, bundle);
+ }
}
capabilities.add(capability);
}
@@ -106,15 +109,18 @@
for (String location : bundleLocations)
{
- AbstractBundle bundle = bundles.get(location);
- try
+ AbstractBundle bundle = bundles.remove(location);
+ if (bundle != null)
{
- bundle.uninstall();
+ try
+ {
+ bundle.uninstall();
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot uninstall bundle: " + bundle);
+ }
}
- catch (BundleException ex)
- {
- log.error("Cannot uninstall bundle: " + bundle);
- }
}
}
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-05-26 19:33:54 UTC (rev 89449)
@@ -22,9 +22,6 @@
<!-- Properties -->
<properties>
- <surefire.runtime.equinox>-Djboss.osgi.framework.config=jboss-osgi-equinox.properties</surefire.runtime.equinox>
- <surefire.runtime.felix>-Djboss.osgi.framework.config=jboss-osgi-felix.properties</surefire.runtime.felix>
- <surefire.runtime.knopflerfish>-Djboss.osgi.framework.config=jboss-osgi-knopflerfish.properties</surefire.runtime.knopflerfish>
</properties>
<!-- Dependencies -->
@@ -126,14 +123,6 @@
<filtering>true</filtering>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Djndi.server.port=1199</argLine>
- </configuration>
- </plugin>
- </plugins>
</build>
<!-- Profiles -->
@@ -150,25 +139,12 @@
<name>!framework</name>
</property>
</activation>
- <properties>
- <surefire.framework.profile.args>${surefire.common.args} ${surefire.runtime.felix}</surefire.framework.profile.args>
- </properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.framework.profile.args}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
</profile>
<!--
@@ -183,25 +159,12 @@
<value>felix</value>
</property>
</activation>
- <properties>
- <surefire.framework.profile.args>${surefire.common.args} ${surefire.runtime.felix}</surefire.framework.profile.args>
- </properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.framework.profile.args}</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
</profile>
<!--
@@ -216,9 +179,6 @@
<value>equinox</value>
</property>
</activation>
- <properties>
- <surefire.framework.profile.args>${surefire.common.args} ${surefire.runtime.equinox}</surefire.framework.profile.args>
- </properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -230,7 +190,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.framework.profile.args}</argLine>
<includes>
<!-- Minimal bootstrap testing -->
<include>org/jboss/test/osgi/bootstrap/BootstrapTestCase.*</include>
@@ -253,9 +212,6 @@
<value>knopflerfish</value>
</property>
</activation>
- <properties>
- <surefire.framework.profile.args>${surefire.common.args} ${surefire.runtime.knopflerfish}</surefire.framework.profile.args>
- </properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
@@ -267,7 +223,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.framework.profile.args}</argLine>
<includes>
<!-- Minimal bootstrap testing -->
<include>org/jboss/test/osgi/bootstrap/BootstrapTestCase.*</include>
@@ -294,7 +249,6 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.framework.profile.args} -Djndi.server.port=1199</argLine>
<excludes>
<!-- Exclude tests that require remote access -->
<exclude>org/jboss/test/osgi/jbossas/**</exclude>
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/.settings/org.eclipse.jdt.core.prefs 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/.settings/org.eclipse.jdt.core.prefs 2009-05-26 19:33:54 UTC (rev 89449)
@@ -1,5 +1,12 @@
-#Wed Feb 04 11:13:20 CET 2009
+#Tue May 26 20:05:29 CEST 2009
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
Copied: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties (from rev 89409, projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-framework.properties)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -0,0 +1,51 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${basedir}/target/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# Framework bootdelegation
+org.osgi.framework.bootdelegation=org.osgi.service.log
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.logging, \
+ org.jboss.osgi.spi.management, \
+ 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.osgi.framework;version\=1.4, \
+ org.apache.log4j, \
+ org.jboss.util, \
+ org.jboss.util.id, \
+ org.jboss.util.threadpool, \
+ org.jboss.util.propertyeditor
+
+# These are needed by jboss-remoting
+# org.apache.log4j, \
+# org.jboss.util, \
+# org.jboss.util.id, \
+# org.jboss.util.threadpool, \
+# org.jboss.util.propertyeditor
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:02:34 UTC (rev 89448)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-framework.properties 2009-05-26 19:33:54 UTC (rev 89449)
@@ -1,51 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id$
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${basedir}/target/osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# Framework bootdelegation
-org.osgi.framework.bootdelegation=org.osgi.service.log
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.spi, \
- org.jboss.osgi.spi.logging, \
- org.jboss.osgi.spi.management, \
- 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.osgi.framework;version\=1.4, \
- org.apache.log4j, \
- org.jboss.util, \
- org.jboss.util.id, \
- org.jboss.util.threadpool, \
- org.jboss.util.propertyeditor
-
-# These are needed by jboss-remoting
-# org.apache.log4j, \
-# org.jboss.util, \
-# org.jboss.util.id, \
-# org.jboss.util.threadpool, \
-# org.jboss.util.propertyeditor
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${test.archive.directory}/bundles/org.apache.felix.log.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar \
- file://${test.archive.directory}/bundles/jboss-osgi-logging.jar
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list