[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wink-commits
Subject:    svn commit: r929661 - in /incubator/wink/trunk/wink-server/src:
From:       rott () apache ! org
Date:       2010-03-31 18:59:43
Message-ID: 20100331185943.636BF23888EC () eris ! apache ! org
[Download RAW message or body]

Author: rott
Date: Wed Mar 31 18:59:43 2010
New Revision: 929661

URL: http://svn.apache.org/viewvc?rev=929661&view=rev
Log:
WINK-267: make RestServlet.service non-final so subclasses can override it

Modified:
    incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
  incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java


Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
                
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/a \
pache/wink/server/internal/servlet/RestServlet.java?rev=929661&r1=929660&r2=929661&view=diff
 ==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java \
                (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java \
Wed Mar 31 18:59:43 2010 @@ -105,7 +105,7 @@ public class RestServlet extends Abstrac
     }
 
     @Override
-    protected final void service(HttpServletRequest httpServletRequest,
+    protected void service(HttpServletRequest httpServletRequest,
                                  HttpServletResponse httpServletResponse) throws \
ServletException,  IOException {
         getRequestProcessor().handleRequest(httpServletRequest, \
httpServletResponse);

Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
                
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/a \
pache/wink/server/internal/servlet/RestServletTest.java?rev=929661&r1=929660&r2=929661&view=diff
 ==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java \
                (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java \
Wed Mar 31 18:59:43 2010 @@ -21,11 +21,16 @@ package org.apache.wink.server.internal.
 
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Map.Entry;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+
 
 
 public class RestServletTest extends MockServletInvocationTest {
@@ -119,6 +124,14 @@ public class RestServletTest extends Moc
         return propFileCustom.getPath();
     }
 
+    // dummy compiler check to confirm service method from RestServlet can be \
overridden +    public class MyRestServlet extends RestServlet {
+        @Override
+        public void service(HttpServletRequest httpServletRequest,
+            HttpServletResponse httpServletResponse) throws ServletException, \
IOException { +        }
+    }
+
     public void testConfirmPublic() throws Exception {
         // confirm these fields are public
         String a = RestServlet.APPLICATION_INIT_PARAM;


[prev in list] [next in list] [prev in thread] [next in thread]