svn commit: r1754745 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java

[rombert]

Author: rombert
Date: Mon Aug  1 12:55:30 2016
New Revision: 1754745

URL: http://svn.apache.org/viewvc?rev=1754745&view=rev
Log:
SLING-5931 - Unable to register a servlet using the R6 Http Service
Whiteboard

The R6WhiteboardServlet is not a SlingServlet

Modified:
    
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/R6WhiteboardServlet.java

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=1754745&r1=1754744&r2=1754745&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
 Mon Aug  1 12:55:30 2016
@@ -19,13 +19,13 @@ package org.apache.sling.launchpad.tests
 import java.io.IOException;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
 
 /**
  * Example Sling servlets registered using the R6 HTTP Whiteboard
@@ -34,13 +34,12 @@ import org.apache.sling.api.servlets.Sli
 @Service(javax.servlet.Servlet.class)
 @Component
 @Property(name="osgi.http.whiteboard.servlet.pattern", value="/whiteboard_r6")
-public class R6WhiteboardServlet extends SlingSafeMethodsServlet {
+public class R6WhiteboardServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;
 
     @Override
-    protected void doGet(SlingHttpServletRequest request, 
SlingHttpServletResponse response)
-            throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request, HttpServletResponse 
response) throws ServletException, IOException {
 
         response.setContentType("text/plain");
         response.getWriter().write("R6 OK");