svn commit: r1754913 - in /sling/trunk/launchpad: integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/ test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/

[rombert]

Author: rombert
Date: Tue Aug  2 13:24:54 2016
New Revision: 1754913

URL: http://svn.apache.org/viewvc?rev=1754913&view=rev
Log:
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.

Modified:
    
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
    
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java?rev=1754913&r1=1754912&r2=1754913&view=diff
==============================================================================
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
 Tue Aug  2 13:24:54 2016
@@ -19,7 +19,6 @@ package org.apache.sling.launchpad.webap
 import java.io.IOException;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.junit.Ignore;
 
 /**
  * Test class which validates that the <tt>R6WhiteboardServlet</tt> is 
registered
@@ -27,7 +26,6 @@ import org.junit.Ignore;
  */
 public class R6WhiteboardServletTest extends HttpTestBase {
 
-    @Ignore("SLING-5931")
     public void testGetServletContent() throws IOException {
         
         String content = getContent(HTTP_BASE_URL + "/whiteboard_r6", 
CONTENT_TYPE_PLAIN);

Modified: 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java?rev=1754913&r1=1754912&r2=1754913&view=diff
==============================================================================
--- 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
 (original)
+++ 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java
 Tue Aug  2 13:24:54 2016
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq
 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 @@ import org.apache.felix.scr.annotations.
  */
 @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;