[jboss-cvs] JBossAS SVN: r87607 - in projects/jboss-osgi/trunk: build/hudson/hudson-home and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Apr 21 03:06:06 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-04-21 03:06:05 -0400 (Tue, 21 Apr 2009)
New Revision: 87607

Added:
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/
Removed:
   projects/jboss-osgi/trunk/runtime/testing/
Modified:
   projects/jboss-osgi/trunk/build/distribution/pom.xml
   projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml
   projects/jboss-osgi/trunk/runtime/equinox/pom.xml
   projects/jboss-osgi/trunk/runtime/felix/pom.xml
   projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
   projects/jboss-osgi/trunk/runtime/pom.xml
   projects/jboss-osgi/trunk/spi/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Restore junit support to SPI

Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -86,23 +86,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <classifier>sources</classifier>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <classifier>javadoc</classifier>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-testsuite-example</artifactId>
       <version>${version}</version>
       <type>zip</type>

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -8,7 +8,10 @@
   
 <table>
 <tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
-<tr align="left"><th>JavaDoc</th><td><a href='job/jbossosgi-jdk16/javadoc/'>SPI</a></td></tr>
+<tr align="left"><th>JavaDoc</th><td>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/spi/target/apidocs/index.html'>SPI</a>&nbsp;
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/runtime/testing/target/apidocs/index.html'>Testing</a>&nbsp;
+</td></tr>
 <tr align="left"><th>Userguide</th><td>
 <a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>&nbsp;
 <a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>&nbsp;

Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -32,11 +32,6 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.equinox</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
     </dependency>

Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -27,11 +27,6 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
     </dependency>

Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -32,11 +32,6 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.knopflerfish</groupId>
       <artifactId>org.knopflerfish.framework</artifactId>
     </dependency>

Modified: projects/jboss-osgi/trunk/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/runtime/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -13,7 +13,6 @@
   
   <modules>
     <module>deployer</module>
-    <module>testing</module>
     <module>equinox</module>
     <module>felix</module>
     <module>knopflerfish</module>

Modified: projects/jboss-osgi/trunk/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/spi/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/spi/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -40,6 +40,10 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit (from rev 87546, projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit)


Property changes on: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -41,11 +41,6 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-aop-mc-int</artifactId>
     </dependency>

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-04-21 04:48:55 UTC (rev 87606)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-04-21 07:06:05 UTC (rev 87607)
@@ -41,11 +41,6 @@
       <version>${version}</version>
     </dependency>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-runtime-testing</artifactId>
-      <version>${version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-aop-mc-int</artifactId>
     </dependency>




More information about the jboss-cvs-commits mailing list