SLING-7329 Remove extension from feature names
authorOliver Lietz <olli@apache.org>
Sat, 23 Dec 2017 21:27:21 +0000 (22:27 +0100)
committerOliver Lietz <olli@apache.org>
Sat, 23 Dec 2017 21:27:21 +0000 (22:27 +0100)
26 files changed:
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionAdapterIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionBundleresourceIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java with 96% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryImplIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDiscoveryStandaloneIT.java with 92% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionDistributionIT.java with 95% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionEventIT.java with 95% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionsThreaddumpIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionThreaddumpIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFeatureflagsIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionFsresourceIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionHealthcheckIT.java with 95% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionI18nIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionJmxProviderIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsIT.java with 94% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionModelsJacksonexporterIT.java with 92% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionPipesIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionQueryIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java with 94% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcePresenceIT.java with 92% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionResourcemergerIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionRewriterIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionSecurityIT.java with 93% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionUrlrewriterIT.java with 94% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionValidationIT.java with 94% similarity]
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java [moved from src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingExtensionXssIT.java with 94% similarity]

@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }
 
@@ -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")
         );
     }