[jboss-cvs] JBossAS SVN: r92482 - in projects/jboss-osgi/trunk/testsuite: functional/src/test/java/org/jboss/test/osgi/framework and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-08-18 03:35:20 -0400 (Tue, 18 Aug 2009)
New Revision: 92482

Modified:
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Be explicit about felix osgi core

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java	2009-08-18 07:09:09 UTC (rev 92481)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/framework/FrameworkTestCase.java	2009-08-18 07:35:20 UTC (rev 92482)
@@ -48,22 +48,9 @@
    @BeforeClass
    public static void beforeClass() throws BundleException
    {
-      try
-      {
-         OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
-         framework = bootProvider.getFramework();
-         framework.start();
-      }
-      catch (BundleException ex)
-      {
-         Throwable cause = ex;
-         while(cause != null)
-         {
-            System.out.println("cause: " + cause.toString());
-            cause = cause.getCause();
-         }
-         throw ex;
-      }
+      OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+      framework = bootProvider.getFramework();
+      framework.start();
    }
 
    @Test

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-08-18 07:09:09 UTC (rev 92481)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-08-18 07:35:20 UTC (rev 92482)
@@ -148,9 +148,16 @@
           <groupId>org.jboss.osgi</groupId>
           <artifactId>jboss-osgi-runtime-felix</artifactId>
           <version>${version.jboss.osgi.runtime.felix}</version>
+          <scope>provided</scope>
         </dependency>
         <dependency>
           <groupId>org.apache.felix</groupId>
+          <artifactId>org.osgi.core</artifactId>
+          <version>${version.apache.felix.core}</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.felix</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <version>${version.apache.felix.core}</version>
           <scope>provided</scope>
@@ -179,6 +186,12 @@
         </dependency>
         <dependency>
           <groupId>org.apache.felix</groupId>
+          <artifactId>org.osgi.core</artifactId>
+          <version>${version.apache.felix.core}</version>
+          <scope>provided</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.felix</groupId>
           <artifactId>org.osgi.compendium</artifactId>
           <version>${version.apache.felix.core}</version>
           <scope>provided</scope>