SLING-4985 - use more robust config-based activation of the test servlet
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1700539 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java b/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java
index 29ec4c4..fc20355 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java
@@ -17,6 +17,7 @@
package org.apache.sling.launchpad.testservices.servlets;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -25,16 +26,16 @@
* Default servlet for the html extension, see SLING-1069.
* This servlet collides with the Default GET Servlet generating proper HTML not
* expected by HtmlDefaultServletTest. For this reason this component is
- * disabled by default and must be enabled for testing in the
- * HtmlDefaultServletTest class.
+ * disabled by default and must be enabled (by creating a config) for testing
+ * in the HtmlDefaultServletTest class.
*/
-@Component(enabled=false, immediate=true, metatype=false)
+@Component(immediate=true, metatype=true, policy=ConfigurationPolicy.REQUIRE)
@Service(value=javax.servlet.Servlet.class)
@Properties({
- @Property(name="service.description", value="HTML Default Test Servlet"),
- @Property(name="service.vendor", value="The Apache Software Foundation"),
- @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default"),
- @Property(name="sling.servlet.extensions", value="html"),
+ @Property(name="service.description", value="HTML Default Test Servlet",propertyPrivate=true),
+ @Property(name="service.vendor", value="The Apache Software Foundation",propertyPrivate=true),
+ @Property(name="sling.servlet.resourceTypes", value="sling/servlet/default",propertyPrivate=true),
+ @Property(name="sling.servlet.extensions", value="html",propertyPrivate=true),
@Property(name="sling.servlet.methods", value="GET")
})
@SuppressWarnings("serial")
