[jboss-cvs] JBossAS SVN: r95758 - in projects/jboss-osgi/projects/bundles/husky/trunk: testsuite and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 29 09:30:23 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-10-29 09:30:22 -0400 (Thu, 29 Oct 2009)
New Revision: 95758

Modified:
   projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/context/context-basic.bnd
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
Log:
Remove dependency on jboss-osgi-jmx

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml	2009-10-29 13:30:22 UTC (rev 95758)
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.jboss.osgi</groupId>
     <artifactId>jboss-osgi-parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <!-- Subversion -->
@@ -40,11 +40,10 @@
 
   <!-- Properties -->
   <properties>
-    <version.aqute.bnd>0.0.356</version.aqute.bnd>
-    <version.apache.felix.log>1.0.0</version.apache.felix.log>
-    <version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
-    <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
-    <version.osgi>r4v42</version.osgi>
+    <version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
+    <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.osgi>4.2.0</version.osgi>
   </properties>
   
   <!-- Modules -->
@@ -57,25 +56,22 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>biz.aQute</groupId>
-        <artifactId>bnd</artifactId>
-        <version>${version.aqute.bnd}</version>
+        <groupId>org.jboss.osgi</groupId>
+        <artifactId>jboss-osgi-spi</artifactId>
+        <version>${version.jboss.osgi.spi}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.log</artifactId>
-        <version>${version.apache.felix.log}</version>
+        <groupId>org.jboss.osgi</groupId>
+        <artifactId>jboss-osgi-testing</artifactId>
+        <version>${version.jboss.osgi.testing}</version>
       </dependency>
+      
       <dependency>
-        <groupId>org.jboss.osgi.bundles</groupId>
-        <artifactId>jboss-osgi-jmx</artifactId>
-        <version>${version.jboss.osgi.jmx}</version>
-      </dependency>
-      <dependency>
         <groupId>org.jboss.osgi.runtime</groupId>
         <artifactId>jboss-osgi-runtime-felix</artifactId>
         <version>${version.jboss.osgi.runtime.felix}</version>
       </dependency>
+      
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml	2009-10-29 13:30:22 UTC (rev 95758)
@@ -41,37 +41,24 @@
       <groupId>biz.aQute</groupId>
       <artifactId>bnd</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-runtime-felix</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
-
-    <!-- Bundle Dependencies -->
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.log</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-jmx</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-log4j</artifactId>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-testing</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -120,8 +107,8 @@
         <configuration>
           <systemProperties>
             <property>
-              <name>test.archive.directory</name>
-              <value>${project.build.directory}/test-libs</value>
+              <name>java.protocol.handler.pkgs</name>
+              <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
             </property>
             <property>
               <name>log4j.output.dir</name>
@@ -131,6 +118,10 @@
               <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>

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml	2009-10-29 13:30:22 UTC (rev 95758)
@@ -15,12 +15,7 @@
       <outputDirectory>bundles</outputDirectory>
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <includes>
-        <include>*:jboss-osgi-common:jar</include>
-        <include>*:jboss-osgi-common-core:jar</include>
-        <include>*:jboss-osgi-jmx:jar</include>
-        <include>*:jboss-osgi-jndi:jar</include>
         <include>*:jboss-osgi-husky:jar</include>
-        <include>*:org.apache.felix.log:jar</include>
         <include>*:org.osgi.compendium:jar</include>
       </includes>
       <useStrictFiltering>true</useStrictFiltering>

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java	2009-10-29 13:30:22 UTC (rev 95758)
@@ -29,10 +29,9 @@
 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.spi.testing.OSGiBundle;
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiTestHelper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,7 +58,6 @@
       if (context == null)
       {
          runtime = new OSGiTestHelper().getDefaultRuntime();
-         runtime.addCapability(new JMXCapability());
          runtime.addCapability(new HuskyCapability());
          
          OSGiBundle bundle = runtime.installBundle("context-basic.jar");

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/MultipleMethodsTestCase.java	2009-10-29 13:30:22 UTC (rev 95758)
@@ -23,16 +23,15 @@
 
 //$Id$
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeNotNull;
 
 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.spi.testing.OSGiBundle;
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiTestHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -59,7 +58,6 @@
       if (context == null)
       {
          runtime = new OSGiTestHelper().getDefaultRuntime();
-         runtime.addCapability(new JMXCapability());
          runtime.addCapability(new HuskyCapability());
          
          OSGiBundle bundle = runtime.installBundle("context-basic.jar");

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/java/org/jboss/test/osgi/husky/context/StaticContextTestCase.java	2009-10-29 13:30:22 UTC (rev 95758)
@@ -29,10 +29,9 @@
 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.spi.testing.OSGiBundle;
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.jboss.osgi.spi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiBundle;
+import org.jboss.osgi.testing.OSGiRuntime;
+import org.jboss.osgi.testing.OSGiTestHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -59,7 +58,6 @@
       if (context == null)
       {
          runtime = new OSGiTestHelper().getDefaultRuntime();
-         runtime.addCapability(new JMXCapability());
          runtime.addCapability(new HuskyCapability());
          
          OSGiBundle bundle = runtime.installBundle("context-basic.jar");

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/context/context-basic.bnd
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/context/context-basic.bnd	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/context/context-basic.bnd	2009-10-29 13:30:22 UTC (rev 95758)
@@ -8,8 +8,7 @@
 	org.jboss.osgi.husky, \
 	org.jboss.osgi.husky.annotation, \
 	org.jboss.osgi.spi.capability, \
-	org.jboss.osgi.spi.testing, \
-	org.jboss.osgi.jmx, \
+	org.jboss.osgi.testing, \
 	org.junit, \
 	org.osgi.framework 
 

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties	2009-10-29 13:29:12 UTC (rev 95757)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/src/test/resources/jboss-osgi-framework.properties	2009-10-29 13:30:22 UTC (rev 95758)
@@ -4,9 +4,6 @@
 # $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
@@ -26,15 +23,15 @@
   	org.jboss.osgi.spi.logging;version=1.0, \
   	org.jboss.osgi.spi.management;version=1.0, \
   	org.jboss.osgi.spi.service;version=1.0, \
-  	org.jboss.osgi.spi.testing;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
-  	org.osgi.framework;version=1.4
+  	org.jboss.osgi.testing;version=1.0, \
+  	org.osgi.framework;version=1.4, \
+  	org.slf4j;version=1.5
 
 # 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 
+#org.jboss.osgi.spi.framework.autoStart=\
+#	file://${test.archive.directory}/bundles/jboss-osgi-common.jar 




More information about the jboss-cvs-commits mailing list