sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1731604 - 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/
Date Mon, 22 Feb 2016 09:06:04 GMT
Author: olli
Date: Mon Feb 22 09:06:03 2016
New Revision: 1731604

URL: http://svn.apache.org/viewvc?rev=1731604&view=rev
Log:
SLING-5540 Provide Rewriter feature

Added:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionRewriterIT.java
      - copied, changed from r1731597, sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.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=1731604&r1=1731603&r2=1731604&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
Mon Feb 22 09:06:03 2016
@@ -470,6 +470,12 @@
     <!-- dependencies -->
     <feature version="${feature.version}">sling</feature>
   </feature>
+  <feature name="sling-extension-rewriter" version="${feature.version}">
+    <bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.1.2</bundle>
+    <!-- dependencies -->
+    <feature version="${feature.version}">sling</feature>
+    <feature version="${feature.version}">sling-commons-html</feature>
+  </feature>
   <feature name="sling-extension-security" version="${feature.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.security/1.0.18</bundle>
     <!-- dependencies -->

Copied: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionRewriterIT.java
(from r1731597, sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.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/SlingExtensionRewriterIT.java?p2=sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionRewriterIT.java&p1=sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java&r1=1731597&r2=1731604&rev=1731604&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionRewriterIT.java
Mon Feb 22 09:06:03 2016
@@ -34,32 +34,18 @@ import static org.junit.Assert.assertNot
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionEventIT extends KarafTestSupport {
+public class SlingExtensionRewriterIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-event")
+            addSlingFeatures("sling-extension-rewriter")
         );
     }
 
     @Test
-    public void testOrgApacheSlingEvent() {
-        final Bundle bundle = findBundle("org.apache.sling.event");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
-    @Test
-    public void testOrgApacheSlingEventDea() {
-        final Bundle bundle = findBundle("org.apache.sling.event.dea");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
-    @Test
-    public void testOrgApacheFelixInventory() {
-        final Bundle bundle = findBundle("org.apache.felix.inventory");
+    public void testOrgApacheSlingRewriter() {
+        final Bundle bundle = findBundle("org.apache.sling.rewriter");
         assertNotNull(bundle);
         assertEquals(Bundle.ACTIVE, bundle.getState());
     }



Mime
View raw message