SLING-5931 - Unable to register a servlet using the R6 Http Service Whiteboard
Use the org.apache.sling HTTP context for the R6WhiteboardServlet. Also enable
the test since the registration works.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1754913 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java b/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
index 780db41..ad164e2 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
@@ -33,7 +34,10 @@
*/
@Service(javax.servlet.Servlet.class)
@Component
-@Property(name="osgi.http.whiteboard.servlet.pattern", value="/whiteboard_r6")
+@Properties({
+ @Property(name="osgi.http.whiteboard.servlet.pattern", value="/whiteboard_r6"),
+ @Property(name="osgi.http.whiteboard.context.select", value="(osgi.http.whiteboard.context.name=org.apache.sling)"),
+})
public class R6WhiteboardServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
