[jboss-cvs] JBossAS SVN: r95761 - in projects/jboss-osgi/trunk: distribution and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 29 10:54:30 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-29 10:54:29 -0400 (Thu, 29 Oct 2009)
New Revision: 95761
Modified:
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd
projects/jboss-osgi/trunk/reactor/framework/pom.xml
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Remove dependency on jboss-osgi-testing
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -72,22 +72,6 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <version>${version.jboss.osgi.testing}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <version>${version.jboss.osgi.testing}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi.testsuite</groupId>
<artifactId>jboss-osgi-testsuite-example</artifactId>
<version>${version}</version>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -67,7 +67,6 @@
<version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
<version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
@@ -89,11 +88,6 @@
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- <version>${version.jboss.osgi.testing}</version>
- </dependency>
<!-- jboss.osgi.bundles -->
<dependency>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -43,10 +43,6 @@
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- </dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/container/BlueprintContainerTestCase.java 2009-10-29 14:54:29 UTC (rev 95761)
@@ -40,6 +40,7 @@
import org.jboss.osgi.husky.BridgeFactory;
import org.jboss.osgi.husky.HuskyCapability;
import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiTestHelper;
@@ -80,6 +81,7 @@
{
runtime = new OSGiTestHelper().getEmbeddedRuntime();
runtime.addCapability(new HuskyCapability());
+ runtime.addCapability(new JMXCapability());
runtime.addCapability(new BlueprintCapability());
huskyBridge = BridgeFactory.getBridge();
Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/container/container-basic.bnd 2009-10-29 14:54:29 UTC (rev 95761)
@@ -11,6 +11,7 @@
org.jboss.osgi.blueprint, \
org.jboss.osgi.husky, \
org.jboss.osgi.husky.annotation, \
+ org.jboss.osgi.jmx, \
org.jboss.osgi.spi.capability, \
org.jboss.osgi.testing, \
org.junit, \
Modified: projects/jboss-osgi/trunk/reactor/framework/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -135,10 +135,6 @@
<artifactId>jboss-osgi-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployers</artifactId>
</dependency>
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-29 14:54:29 UTC (rev 95761)
@@ -26,11 +26,9 @@
import org.jboss.osgi.spi.capability.Capability;
import org.jboss.osgi.spi.capability.CompendiumCapability;
import org.jboss.osgi.spi.service.MicrocontainerService;
-import org.jboss.osgi.testing.OSGiRuntime;
/**
- * Adds the Microcontainer capability to the {@link OSGiRuntime}
- * under test.
+ * Adds the Microcontainer capability to the OSGiRuntime under test.
*
* This implementation does nothing because the JBossMC based framework
* does support microcontainer natively.
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -44,7 +44,6 @@
<modules>
<module>deployment</module>
- <module>testing</module>
<module>blueprint</module>
<module>jmx</module>
<module>jta</module>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/blueprint/BlueprintTestCase.java 2009-10-29 14:54:29 UTC (rev 95761)
@@ -33,6 +33,7 @@
import org.jboss.osgi.husky.BridgeFactory;
import org.jboss.osgi.husky.HuskyCapability;
import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
import org.jboss.osgi.testing.OSGiTestHelper;
@@ -66,6 +67,7 @@
{
runtime = new OSGiTestHelper().getDefaultRuntime();
runtime.addCapability(new HuskyCapability());
+ runtime.addCapability(new JMXCapability());
runtime.addCapability(new BlueprintCapability());
OSGiBundle bundle = runtime.installBundle("example-blueprint.jar");
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jta/TransactionTestCase.java 2009-10-29 14:54:29 UTC (rev 95761)
@@ -50,6 +50,7 @@
{
runtime = new OSGiTestHelper().getDefaultRuntime();
runtime.addCapability(new HuskyCapability());
+ runtime.addCapability(new HuskyCapability());
runtime.addCapability(new TransactionCapability());
}
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/blueprint/example-blueprint.bnd 2009-10-29 14:54:29 UTC (rev 95761)
@@ -9,7 +9,8 @@
org.jboss.osgi.blueprint, \
org.jboss.osgi.husky, \
org.jboss.osgi.husky.annotation, \
- org.jboss.osgi.spi*, \
+ org.jboss.osgi.jmx, \
+ org.jboss.osgi.spi.capability, \
org.jboss.osgi.testing, \
org.junit, \
org.osgi.framework, \
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-29 13:52:35 UTC (rev 95760)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-29 14:54:29 UTC (rev 95761)
@@ -56,10 +56,6 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testing</artifactId>
- </dependency>
<!-- Bundle Dependencies -->
<dependency>
More information about the jboss-cvs-commits
mailing list