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 2017/12/23 22:21:12 UTC

[sling-org-apache-sling-karaf-integration-tests] branch master updated (3dc6b3d -> 229b8d9)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.


    from 3dc6b3d  SLING-7327 Remove launchpad from feature names
     new c24446f  SLING-7330 Remove feature sling-extension-explorer
     new 229b8d9  SLING-7329 Remove extension from feature names

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ...ExtensionAdapterIT.java => SlingAdapterIT.java} |  4 +-
 ...eresourceIT.java => SlingBundleresourceIT.java} |  4 +-
 ...nsionDiscoveryIT.java => SlingDiscoveryIT.java} |  4 +-
 ...coveryImplIT.java => SlingDiscoveryImplIT.java} |  4 +-
 ...iscoveryOakIT.java => SlingDiscoveryOakIT.java} |  4 +-
 ...loneIT.java => SlingDiscoveryStandaloneIT.java} |  4 +-
 ...istributionIT.java => SlingDistributionIT.java} |  4 +-
 ...lingExtensionEventIT.java => SlingEventIT.java} |  4 +-
 .../tests/bootstrap/SlingExtensionExplorerIT.java  | 53 ----------------------
 ...umpIT.java => SlingExtensionsThreaddumpIT.java} |  4 +-
 ...eatureflagsIT.java => SlingFeatureflagsIT.java} |  4 +-
 ...ionFsresourceIT.java => SlingFsresourceIT.java} |  4 +-
 ...nHealthcheckIT.java => SlingHealthcheckIT.java} |  4 +-
 ...{SlingExtensionI18nIT.java => SlingI18nIT.java} |  4 +-
 ...nJmxProviderIT.java => SlingJmxProviderIT.java} |  4 +-
 ...ngExtensionModelsIT.java => SlingModelsIT.java} |  4 +-
 ...erIT.java => SlingModelsJacksonexporterIT.java} |  4 +-
 ...lingExtensionPipesIT.java => SlingPipesIT.java} |  4 +-
 ...lingExtensionQueryIT.java => SlingQueryIT.java} |  4 +-
 ...entoryIT.java => SlingResourceInventoryIT.java} |  4 +-
 ...resenceIT.java => SlingResourcePresenceIT.java} |  4 +-
 ...rcemergerIT.java => SlingResourcemergerIT.java} |  4 +-
 ...tensionRewriterIT.java => SlingRewriterIT.java} |  4 +-
 ...tensionSecurityIT.java => SlingSecurityIT.java} |  4 +-
 ...nUrlrewriterIT.java => SlingUrlrewriterIT.java} |  4 +-
 ...ionValidationIT.java => SlingValidationIT.java} |  4 +-
 .../{SlingExtensionXssIT.java => SlingXssIT.java}  |  4 +-
 27 files changed, 52 insertions(+), 105 deletions(-)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionAdapterIT.java => SlingAdapterIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionBundleresourceIT.java => SlingBundleresourceIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionDiscoveryIT.java => SlingDiscoveryIT.java} (96%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionDiscoveryImplIT.java => SlingDiscoveryImplIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionDiscoveryOakIT.java => SlingDiscoveryOakIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionDiscoveryStandaloneIT.java => SlingDiscoveryStandaloneIT.java} (92%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionDistributionIT.java => SlingDistributionIT.java} (95%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionEventIT.java => SlingEventIT.java} (95%)
 delete mode 100644 src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionExplorerIT.java
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionThreaddumpIT.java => SlingExtensionsThreaddumpIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionFeatureflagsIT.java => SlingFeatureflagsIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionFsresourceIT.java => SlingFsresourceIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionHealthcheckIT.java => SlingHealthcheckIT.java} (95%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionI18nIT.java => SlingI18nIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionJmxProviderIT.java => SlingJmxProviderIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionModelsIT.java => SlingModelsIT.java} (94%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionModelsJacksonexporterIT.java => SlingModelsJacksonexporterIT.java} (92%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionPipesIT.java => SlingPipesIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionQueryIT.java => SlingQueryIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionResourceInventoryIT.java => SlingResourceInventoryIT.java} (94%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionResourcePresenceIT.java => SlingResourcePresenceIT.java} (92%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionResourcemergerIT.java => SlingResourcemergerIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionRewriterIT.java => SlingRewriterIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionSecurityIT.java => SlingSecurityIT.java} (93%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionUrlrewriterIT.java => SlingUrlrewriterIT.java} (94%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionValidationIT.java => SlingValidationIT.java} (94%)
 rename src/test/java/org/apache/sling/karaf/tests/bootstrap/{SlingExtensionXssIT.java => SlingXssIT.java} (94%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-7330 Remove feature sling-extension-explorer

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git

commit c24446fe46ec08b02fdb9e520a7aa0967732d68b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Dec 23 22:18:07 2017 +0100

    SLING-7330 Remove feature sling-extension-explorer
---
 .../tests/bootstrap/SlingExtensionExplorerIT.java  | 53 ----------------------
 1 file changed, 53 deletions(-)

diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionExplorerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionExplorerIT.java
deleted file mode 100644
index 3254c72..0000000
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionExplorerIT.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.karaf.tests.bootstrap;
-
-import org.apache.sling.karaf.testing.KarafTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
-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.osgi.framework.Bundle;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingExtensionExplorerIT extends KarafTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-explorer")
-        );
-    }
-
-    @Test
-    public void testOrgApacheSlingExtensionsExplorer() {
-        final Bundle bundle = findBundle("org.apache.sling.extensions.explorer");
-        assertNotNull(bundle);
-        assertEquals(Bundle.ACTIVE, bundle.getState());
-    }
-
-}

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-7329 Remove extension from feature names

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git

commit 229b8d9a63f8fe263e76a1ec230c18d0a6cc036d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Dec 23 22:27:21 2017 +0100

    SLING-7329 Remove extension from feature names
---
 .../bootstrap/{SlingExtensionAdapterIT.java => SlingAdapterIT.java}   | 4 ++--
 ...SlingExtensionBundleresourceIT.java => SlingBundleresourceIT.java} | 4 ++--
 .../{SlingExtensionDiscoveryIT.java => SlingDiscoveryIT.java}         | 4 ++--
 .../{SlingExtensionDiscoveryImplIT.java => SlingDiscoveryImplIT.java} | 4 ++--
 .../{SlingExtensionDiscoveryOakIT.java => SlingDiscoveryOakIT.java}   | 4 ++--
 ...sionDiscoveryStandaloneIT.java => SlingDiscoveryStandaloneIT.java} | 4 ++--
 .../{SlingExtensionDistributionIT.java => SlingDistributionIT.java}   | 4 ++--
 .../tests/bootstrap/{SlingExtensionEventIT.java => SlingEventIT.java} | 4 ++--
 ...ingExtensionThreaddumpIT.java => SlingExtensionsThreaddumpIT.java} | 4 ++--
 .../{SlingExtensionFeatureflagsIT.java => SlingFeatureflagsIT.java}   | 4 ++--
 .../{SlingExtensionFsresourceIT.java => SlingFsresourceIT.java}       | 4 ++--
 .../{SlingExtensionHealthcheckIT.java => SlingHealthcheckIT.java}     | 4 ++--
 .../tests/bootstrap/{SlingExtensionI18nIT.java => SlingI18nIT.java}   | 4 ++--
 .../{SlingExtensionJmxProviderIT.java => SlingJmxProviderIT.java}     | 4 ++--
 .../bootstrap/{SlingExtensionModelsIT.java => SlingModelsIT.java}     | 4 ++--
 ...ModelsJacksonexporterIT.java => SlingModelsJacksonexporterIT.java} | 4 ++--
 .../tests/bootstrap/{SlingExtensionPipesIT.java => SlingPipesIT.java} | 4 ++--
 .../tests/bootstrap/{SlingExtensionQueryIT.java => SlingQueryIT.java} | 4 ++--
 ...xtensionResourceInventoryIT.java => SlingResourceInventoryIT.java} | 4 ++--
 ...gExtensionResourcePresenceIT.java => SlingResourcePresenceIT.java} | 4 ++--
 ...SlingExtensionResourcemergerIT.java => SlingResourcemergerIT.java} | 4 ++--
 .../bootstrap/{SlingExtensionRewriterIT.java => SlingRewriterIT.java} | 4 ++--
 .../bootstrap/{SlingExtensionSecurityIT.java => SlingSecurityIT.java} | 4 ++--
 .../{SlingExtensionUrlrewriterIT.java => SlingUrlrewriterIT.java}     | 4 ++--
 .../{SlingExtensionValidationIT.java => SlingValidationIT.java}       | 4 ++--
 .../tests/bootstrap/{SlingExtensionXssIT.java => SlingXssIT.java}     | 4 ++--
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionAdapterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionAdapterIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
index ae19743..831346b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionAdapterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionAdapterIT extends KarafTestSupport {
+public class SlingAdapterIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-adapter")
+            addSlingFeatures("sling-adapter")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
index cc23625..48904c4 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionBundleresourceIT extends KarafTestSupport {
+public class SlingBundleresourceIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-bundleresource")
+            addSlingFeatures("sling-bundleresource")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
similarity index 96%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
index 254b883..4ad447d 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionDiscoveryIT extends KarafTestSupport {
+public class SlingDiscoveryIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-discovery")
+            addSlingFeatures("sling-discovery")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
index 0c09f02..3fe7ac9 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionDiscoveryImplIT extends KarafTestSupport {
+public class SlingDiscoveryImplIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-discovery-impl")
+            addSlingFeatures("sling-discovery-impl")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
index e9f7d66..d1cf7f5 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionDiscoveryOakIT extends KarafTestSupport {
+public class SlingDiscoveryOakIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-discovery-oak")
+            addSlingFeatures("sling-discovery-oak")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
index 92dddbc..76428d5 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionDiscoveryStandaloneIT extends KarafTestSupport {
+public class SlingDiscoveryStandaloneIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-discovery-standalone")
+            addSlingFeatures("sling-discovery-standalone")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDistributionIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
similarity index 95%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDistributionIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
index 77af001..63db8d0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDistributionIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionDistributionIT extends KarafTestSupport {
+public class SlingDistributionIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-distribution")
+            addSlingFeatures("sling-distribution")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionEventIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
similarity index 95%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionEventIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
index e42a4f5..200e0bb 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionEventIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionEventIT extends KarafTestSupport {
+public class SlingEventIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-event")
+            addSlingFeatures("sling-event")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionsThreaddumpIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionsThreaddumpIT.java
index 562319a..e59b0f9 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionsThreaddumpIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionThreaddumpIT extends KarafTestSupport {
+public class SlingExtensionsThreaddumpIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-threaddump")
+            addSlingFeatures("sling-extensions-threaddump")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFeatureflagsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFeatureflagsIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
index 7bf6817..a5cd7b5 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFeatureflagsIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionFeatureflagsIT extends KarafTestSupport {
+public class SlingFeatureflagsIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-featureflags")
+            addSlingFeatures("sling-featureflags")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
index 55a7845..ed2f944 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionFsresourceIT extends KarafTestSupport {
+public class SlingFsresourceIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-fsresource")
+            addSlingFeatures("sling-fsresource")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
similarity index 95%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
index eb85ca0..54e6dd0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionHealthcheckIT extends KarafTestSupport {
+public class SlingHealthcheckIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-healthcheck")
+            addSlingFeatures("sling-healthcheck")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionI18nIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionI18nIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
index c9c303a..9ceda96 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionI18nIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionI18nIT extends KarafTestSupport {
+public class SlingI18nIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-i18n")
+            addSlingFeatures("sling-i18n")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
index 93c5560..0c0a7fe 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionJmxProviderIT extends KarafTestSupport {
+public class SlingJmxProviderIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-jmx-provider")
+            addSlingFeatures("sling-jmx-provider")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
similarity index 94%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
index e5a01b5..e9f51f7 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionModelsIT extends KarafTestSupport {
+public class SlingModelsIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-models")
+            addSlingFeatures("sling-models")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsJacksonexporterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsJacksonexporterIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
index 4e308ab..633c610 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsJacksonexporterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionModelsJacksonexporterIT extends KarafTestSupport {
+public class SlingModelsJacksonexporterIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-models-jacksonexporter")
+            addSlingFeatures("sling-models-jacksonexporter")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionPipesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionPipesIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
index e315754..325c16d 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionPipesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionPipesIT extends KarafTestSupport {
+public class SlingPipesIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-pipes")
+            addSlingFeatures("sling-pipes")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionQueryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionQueryIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
index 805a228..e487b79 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionQueryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionQueryIT extends KarafTestSupport {
+public class SlingQueryIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-query")
+            addSlingFeatures("sling-query")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
similarity index 94%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
index f2e43ef..e4c2683 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionResourceInventoryIT extends KarafTestSupport {
+public class SlingResourceInventoryIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-resource-inventory")
+            addSlingFeatures("sling-resource-inventory")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcePresenceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcePresenceIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
index 1a2aff6..c2fdeb4 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcePresenceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionResourcePresenceIT extends KarafTestSupport {
+public class SlingResourcePresenceIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-resource-presence")
+            addSlingFeatures("sling-resource-presence")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
index 1e7e0c6..8111add 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionResourcemergerIT extends KarafTestSupport {
+public class SlingResourcemergerIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-resourcemerger")
+            addSlingFeatures("sling-resourcemerger")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionRewriterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionRewriterIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
index a1730e9..12e26df 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionRewriterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionRewriterIT extends KarafTestSupport {
+public class SlingRewriterIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-rewriter")
+            addSlingFeatures("sling-rewriter")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionSecurityIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionSecurityIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
index c864322..b1f0da7 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionSecurityIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionSecurityIT extends KarafTestSupport {
+public class SlingSecurityIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-security")
+            addSlingFeatures("sling-security")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
similarity index 94%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
index d0eac74..2eea6af 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionUrlrewriterIT extends KarafTestSupport {
+public class SlingUrlrewriterIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-urlrewriter")
+            addSlingFeatures("sling-urlrewriter")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionValidationIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
similarity index 94%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionValidationIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
index a208283..2bc3199 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionValidationIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionValidationIT extends KarafTestSupport {
+public class SlingValidationIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-validation")
+            addSlingFeatures("sling-validation")
         );
     }
 
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionXssIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
similarity index 94%
rename from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionXssIT.java
rename to src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
index 2d599d0..cb207f0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionXssIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
@@ -34,12 +34,12 @@ import static org.junit.Assert.assertNotNull;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingExtensionXssIT extends KarafTestSupport {
+public class SlingXssIT extends KarafTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return OptionUtils.combine(baseConfiguration(),
-            addSlingFeatures("sling-extension-xss")
+            addSlingFeatures("sling-xss")
         );
     }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.