[jboss-osgi-commits] JBoss-OSGI SVN: r87404 - in projects/jboss-osgi/trunk: runtime and 9 other directories.

jboss-osgi-commits at lists.jboss.org jboss-osgi-commits at lists.jboss.org
Thu Apr 16 04:04:26 EDT 2009 

Author: thomas.diesler at jboss.com
Date: 2009-04-16 04:04:26 -0400 (Thu, 16 Apr 2009)
New Revision: 87404

Added:
   projects/jboss-osgi/trunk/testsuite/.project
Removed:
   projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/service/
   projects/jboss-osgi/trunk/runtime/spi/src/main/java/org/jboss/osgi/spi/junit/
Modified:
   projects/jboss-osgi/trunk/pom.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/runtime/spi/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/
   projects/jboss-osgi/trunk/testsuite/example/.classpath
   projects/jboss-osgi/trunk/testsuite/functional/
   projects/jboss-osgi/trunk/testsuite/functional/.classpath
Log:
Extract OSGi junit test support in separate module

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-04-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -293,11 +293,17 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <redirectTestOutputToFile>false</redirectTestOutputToFile>
+          <failIfNoTests>false</failIfNoTests>
           <systemProperties>
             <property>
               <name>test.archive.directory</name>
               <value>${project.build.directory}/test-libs</value>
             </property>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${basedir}/target</value>
+            </property>
           </systemProperties>
         </configuration>
       </plugin>
@@ -312,19 +318,6 @@
             <downloadSources>true</downloadSources>
           </configuration>
         </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <redirectTestOutputToFile>false</redirectTestOutputToFile>
-            <failIfNoTests>false</failIfNoTests>
-            <systemProperties>
-              <property>
-                <name>log4j.output.dir</name>
-                <value>${basedir}/target</value>
-              </property>
-            </systemProperties>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>

Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml	2009-04-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -32,6 +32,11 @@
       <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-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -27,6 +27,11 @@
       <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-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -32,6 +32,11 @@
       <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-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/runtime/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -14,6 +14,7 @@
   <modules>
     <module>spi</module>
     <module>deployer</module>
+    <module>testing</module>
     <module>equinox</module>
     <module>felix</module>
     <module>knopflerfish</module>

Modified: projects/jboss-osgi/trunk/runtime/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/pom.xml	2009-04-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/runtime/spi/pom.xml	2009-04-16 08:04:26 UTC (rev 87404)
@@ -19,18 +19,6 @@
   <!-- Dependencies -->
   <dependencies>
     <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-common</artifactId>
-      <version>${version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-remotelog</artifactId>
-      <version>${version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
       <scope>provided</scope>
@@ -52,10 +40,6 @@
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-kernel</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

Added: projects/jboss-osgi/trunk/testsuite/.project
===================================================================
--- projects/jboss-osgi/trunk/testsuite/.project	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/.project	2009-04-16 08:04:26 UTC (rev 87404)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jboss-osgi-testsuite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: projects/jboss-osgi/trunk/testsuite/example
___________________________________________________________________
Name: svn:ignore
   - target

   + target
felix-cache


Modified: projects/jboss-osgi/trunk/testsuite/example/.classpath
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/.classpath	2009-04-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/testsuite/example/.classpath	2009-04-16 08:04:26 UTC (rev 87404)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-osgi-runtime-spi"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>


Property changes on: projects/jboss-osgi/trunk/testsuite/functional
___________________________________________________________________
Name: svn:ignore
   - felix-cache

   + felix-cache
target


Modified: projects/jboss-osgi/trunk/testsuite/functional/.classpath
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/.classpath	2009-04-16 08:04:11 UTC (rev 87403)
+++ projects/jboss-osgi/trunk/testsuite/functional/.classpath	2009-04-16 08:04:26 UTC (rev 87404)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jboss-osgi-runtime-spi"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

More information about the jboss-osgi-commits mailing list