svn commit: r825613 - in /felix/trunk/karaf: itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java pom.xml

[gn...@apache.org]

Author: gnodet
Date: Thu Oct 15 18:41:10 2009
New Revision: 825613

URL: http://svn.apache.org/viewvc?rev=825613&view=rev
Log:
FELIX-1761: include felix as a platform for karaf integration tests

Modified:
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java
    felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java
    felix/trunk/karaf/pom.xml

Modified: felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java?rev=825613&r1=825612&r2=825613&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/CoreTest.java Thu Oct 15 18:41:10 2009
@@ -119,7 +119,7 @@
             systemProperty("karaf.startRemoteShell").value("false"),
 
             // hack system packages
-            systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
+            systemPackages("org.apache.felix.karaf.jaas.boot;version=1.99"),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
 
@@ -140,7 +140,7 @@
             mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.osgi"),
             mavenBundle("org.apache.felix.karaf.shell", "org.apache.felix.karaf.shell.log").noStart(),
 
-            equinox()
+            equinox(), felix()
         );
         // We need to add pax-exam-junit here when running with the ibm
         // jdk to avoid the following exception during the test run:

Modified: felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java?rev=825613&r1=825612&r2=825613&view=diff
==============================================================================
--- felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java (original)
+++ felix/trunk/karaf/itests/src/test/java/org/apache/felix/karaf/shell/itests/FeaturesTest.java Thu Oct 15 18:41:10 2009
@@ -21,6 +21,7 @@
 import org.junit.runner.RunWith;
 import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
 import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemPackages;
@@ -63,7 +64,7 @@
             systemProperty("karaf.startRemoteShell").value("false"),
 
             // hack system packages
-            systemPackages("org.apache.felix.karaf.main.spi;version=1.0.0", "org.apache.felix.karaf.jaas.boot;version=0.9.0"),
+            systemPackages("org.apache.felix.karaf.jaas.boot;version=1.99"),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf.jaas", "org.apache.felix.karaf.jaas.boot")).afterFramework(),
             bootClasspathLibrary(mavenBundle("org.apache.felix.karaf", "org.apache.felix.karaf.main")).afterFramework(),
 
@@ -91,7 +92,7 @@
                     "obr", "wrapper"
             ),
 
-            equinox()
+            equinox(), felix()
         );
         // We need to add pax-exam-junit here when running with the ibm
         // jdk to avoid the following exception during the test run:

Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=825613&r1=825612&r2=825613&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Thu Oct 15 18:41:10 2009
@@ -91,9 +91,9 @@
         <log4j.version>1.2.14</log4j.version>
         <maven.version>2.0.9</maven.version>
         <mina.version>2.0.0-M6</mina.version>
-        <pax.exam.version>1.0.0</pax.exam.version>
+        <pax.exam.version>1.1.0</pax.exam.version>
         <pax.logging.version>1.4</pax.logging.version>
-        <pax.runner.version>1.1.1</pax.runner.version>
+        <pax.runner.version>1.2.1</pax.runner.version>
         <pax.url.version>1.0.0</pax.url.version>
         <pax.web.version>0.6.0</pax.web.version>
         <servlet.api.version>2.5</servlet.api.version>