You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/04/22 12:28:52 UTC
svn commit: r1675316 - in /sling/trunk/contrib/launchpad/karaf: org.apache.sling.launchpad.karaf-features/src/main/feature/ org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/

Author: olli
Date: Wed Apr 22 10:28:52 2015
New Revision: 1675316

URL: http://svn.apache.org/r1675316
Log:
SLING-3027 SLING-3017 merge derby-sling and sling-launchpad-jackrabbit into sling-launchpad-jackrabbit-derby

Added:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java
      - copied, changed from r1675308, sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitIT.java
Removed:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitIT.java
Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1675316&r1=1675315&r2=1675316&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml Wed Apr 22 10:28:52 2015
@@ -51,10 +51,6 @@
     <!-- bundle dependencies (commons-fileupload) -->
     <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
   </feature>
-  <!-- Apache Derby -->
-  <feature name="derby-sling" version="${project.version}">
-    <bundle dependency="true">mvn:org.apache.derby/derby/10.10.2.0</bundle>
-  </feature>
   <!-- Apache Sling -->
   <feature name="sling" version="${project.version}">
     <feature version="${project.version}">infrastructure-sling</feature>
@@ -182,7 +178,7 @@
     <feature version="${project.version}">sling-auth-form</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.8</bundle>
   </feature>
-  <feature name="sling-launchpad-jackrabbit" version="${project.version}">
+  <feature name="sling-launchpad-jackrabbit-derby" version="${project.version}">
     <!-- Sling with Jackrabbit Repository and Felix Web Console -->
     <feature version="${project.version}">infrastructure-sling</feature>
     <feature version="${project.version}">webconsole-sling</feature>
@@ -197,6 +193,8 @@
     <feature version="${project.version}">sling-scripting-jsp</feature>
     <feature version="${project.version}">sling-extension-adapter</feature>
     <feature version="${project.version}">sling-extension-bundleresource</feature>
+    <!-- bundle dependencies -->
+    <bundle dependency="true">mvn:org.apache.derby/derby/10.10.2.0</bundle>
   </feature>
   <feature name="sling-launchpad-oak" version="${project.version}">
     <!-- Sling with Oak Repository and Felix Web Console -->
@@ -233,7 +231,6 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.2.2</bundle>
   </feature>
   <!-- Apache Sling JCR Jackrabbit -->
-  <!-- TODO needs a database impl! -->
   <feature name="sling-jcr-jackrabbit" version="${project.version}">
     <feature version="${project.version}">sling-jcr</feature>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.2.0</bundle>

Copied: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java (from r1675308, sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitIT.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java?p2=sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java&p1=sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitIT.java&r1=1675308&r2=1675316&rev=1675316&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java Wed Apr 22 10:28:52 2015
@@ -32,12 +32,14 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 import org.ops4j.pax.exam.util.Filter;
+import org.osgi.framework.Bundle;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingLaunchpadJackrabbitIT extends KarafTestSupport {
+public class SlingLaunchpadJackrabbitDerbyIT extends KarafTestSupport {
 
     @Inject
     @Filter(timeout = 300000)
@@ -46,11 +48,18 @@ public class SlingLaunchpadJackrabbitIT
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addBootFeature("sling-launchpad-jackrabbit")
+            addBootFeature("sling-launchpad-jackrabbit-derby")
         );
     }
 
     @Test
+    public void testDerby() {
+        final Bundle bundle = findBundle("derby");
+        assertNotNull(bundle);
+        assertEquals(Bundle.RESOLVED, bundle.getState());
+    }
+
+    @Test
     public void testSlingRepository() throws Exception {
         assertNotNull(slingRepository);
     }