svn commit: r1489777 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/ test/org/apache/catalina/filters/

[markt]

Author: markt
Date: Wed Jun  5 09:51:00 2013
New Revision: 1489777

URL: http://svn.apache.org/r1489777
Log:
Prep for CORS filter

Added:
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
      - copied, changed from r1489196, 
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
Removed:
    tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterResponse.java
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
    
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1489196

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1489777&r1=1489776&r2=1489777&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
 Wed Jun  5 09:51:00 2013
@@ -30,7 +30,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.LoginConfig;
-import org.apache.catalina.filters.TesterResponse;
+import org.apache.catalina.filters.TesterHttpServletResponse;
 import org.apache.catalina.startup.TestTomcat.MapRealm;
 import org.apache.catalina.util.ConcurrentMessageDigest;
 import org.apache.catalina.util.MD5Encoder;
@@ -157,7 +157,7 @@ public class TesterDigestAuthenticatorPe
 
             request = new TesterDigestRequest();
 
-            response = new TesterResponse();
+            response = new TesterHttpServletResponse();
 
             config = new LoginConfig();
             config.setRealmName(REALM);

Modified: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=1489777&r1=1489776&r2=1489777&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
 Wed Jun  5 09:51:00 2013
@@ -83,7 +83,6 @@ public class TestCsrfPreventionFilter ex
         ByteArrayInputStream bais =
             new ByteArrayInputStream(baos.toByteArray());
         ObjectInputStream ois = new ObjectInputStream(bais);
-        @SuppressWarnings("unchecked")
         LruCache<String> cache2 = (LruCache<String>) ois.readObject();
 
         cache2.add("key7");
@@ -103,7 +102,7 @@ public class TestCsrfPreventionFilter ex
         }
     }
 
-    private static class NonEncodingResponse extends TesterResponse {
+    private static class NonEncodingResponse extends TesterHttpServletResponse 
{
 
         @Override
         public String encodeRedirectURL(String url) {

Copied: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
 (from r1489196, 
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java&p1=tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java&r1=1489196&r2=1489777&rev=1489777&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/filters/TesterHttpServletResponse.java
 Wed Jun  5 09:51:00 2013
@@ -197,6 +197,4 @@ public class TesterHttpServletResponse i
     @Override
     @Deprecated
     public void setStatus(int status, String message) {/* NOOP */}
-    @Override
-    public void setContentLengthLong(long length) {/* NOOP */}
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org