tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1187806 [5/5] - in /tomcat/trunk/test: javax/el/ javax/servlet/jsp/ org/apache/catalina/authenticator/ org/apache/catalina/connector/ org/apache/catalina/core/ org/apache/catalina/deploy/ org/apache/catalina/filters/ org/apache/catalina/ha...
Date Sat, 22 Oct 2011 21:23:12 GMT
Modified: tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestWarDirContext extends TomcatBaseTest {
-    
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
@@ -50,20 +50,20 @@ public class TestWarDirContext extends T
     @Test
     public void testLookupException() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         File appDir = new File("test/webapp-3.0-fragments");
         // app dir is relative to server home
         tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-        
+
         tomcat.start();
-        
+
         ByteChunk bc = getUrl("http://localhost:" + getPort() +
                 "/test/warDirContext.jsp");
         assertEquals("<p>java.lang.ClassNotFoundException</p>",
                 bc.toString());
     }
 
-    
+
     /**
      * Additional test following on from SPR-7350 above to check files that
      * contain JNDI reserved characters can be served when caching is enabled.
@@ -71,13 +71,13 @@ public class TestWarDirContext extends T
     @Test
     public void testReservedJNDIFileNamesWithCache() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         File appDir = new File("test/webapp-3.0-fragments");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(
                 null, "/test", appDir.getAbsolutePath());
         ctxt.setCachingAllowed(true);
-        
+
         tomcat.start();
 
         // Should be found in resources.jar
@@ -93,7 +93,7 @@ public class TestWarDirContext extends T
                 bc.toString());
     }
 
-    
+
     /**
      * Additional test following on from SPR-7350 above to check files that
      * contain JNDI reserved characters can be served when caching is disabled.
@@ -101,13 +101,13 @@ public class TestWarDirContext extends T
     @Test
     public void testReservedJNDIFileNamesNoCache() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        
+
         File appDir = new File("test/webapp-3.0-fragments");
         // app dir is relative to server home
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(
                 null, "/test", appDir.getAbsolutePath());
         ctxt.setCachingAllowed(false);
-        
+
         tomcat.start();
 
         // Should be found in resources.jar

Modified: tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/test/org/apache/naming/resources/TesterObject.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TesterObject.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TesterObject.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TesterObject.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,11 +24,11 @@ public class TesterObject {
     public String toString() {
         return "This is a test object (" + super.toString() + ").";
     }
-    
+
     public void setFoo(String foo) {
         this.foo = foo;
     }
-    
+
     public String getFoo() {
         return this.foo;
     }

Modified: tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/buf/TestByteChunk.java Sat Oct 22 21:23:07 2011
@@ -40,7 +40,7 @@ public class TestByteChunk {
 
     /**
      * Test for {@code findByte} vs. {@code indexOf} methods difference.
-     * 
+     *
      * <p>
      * As discussed in the "Re: r944918" thread on dev@, {@code
      * ByteChunk.indexOf()} works for 0-127 ASCII chars only, and cannot find

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Sat Oct 22 21:23:07 2011
@@ -42,17 +42,17 @@ public abstract class CookiesBaseTest ex
     public static class CookieServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
-        
+
         private final String cookieName;
         private final String cookieValue;
-        
+
         public CookieServlet(String cookieName, String cookieValue) {
             this.cookieName = cookieName;
             this.cookieValue = cookieValue;
         }
-        
+
         @Override
-        public void doGet(HttpServletRequest req, HttpServletResponse res) 
+        public void doGet(HttpServletRequest req, HttpServletResponse res)
                 throws IOException {
             try {
                 Cookie cookie = new Cookie(cookieName, cookieValue);
@@ -62,13 +62,13 @@ public abstract class CookiesBaseTest ex
                 res.getWriter().write("Cookie name fail");
             }
         }
-        
+
     }
-    
+
 
     public static void addServlets(Tomcat tomcat) {
         // Must have a real docBase - just use temp
-        Context ctx = 
+        Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 
         Tomcat.addServlet(ctx, "invalid", new CookieServlet("na;me", "value"));
@@ -91,5 +91,5 @@ public abstract class CookiesBaseTest ex
     }
 
     public abstract void testCookiesInstance() throws Exception;
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java Sat Oct 22 21:23:07 2011
@@ -44,7 +44,7 @@ import org.apache.tomcat.util.buf.ByteCh
  */
 public class TestBug49158 extends CookiesBaseTest {
     public static final String path = "49158";
-    
+
     @Override
     @Test
     public void testCookiesInstance() throws Exception {
@@ -52,22 +52,22 @@ public class TestBug49158 extends Cookie
         addServlets(tomcat);
         tomcat.start();
         Map<String,List<String>> headers = new HashMap<String,List<String>>();
-        ByteChunk res = new ByteChunk(); 
+        ByteChunk res = new ByteChunk();
         getUrl("http://localhost:" + getPort() + "/"+path, res, headers);
         List<String> cookieHeaders = headers.get("Set-Cookie");
         assertEquals("There should only be one Set-Cookie header in this test",
                 1, cookieHeaders.size());
     }
-    
+
     public static void addServlets(Tomcat tomcat) {
         // Must have a real docBase - just use temp
-        Context ctx = 
+        Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
 
         Tomcat.addServlet(ctx, path, new TestBug49158Servlet());
         ctx.addServletMapping("/"+path, path);
     }
-    
+
     public static class TestBug49158Servlet extends HttpServlet {
 
         private static final long serialVersionUID = 2725990508758127399L;
@@ -81,7 +81,7 @@ public class TestBug49158 extends Cookie
             session.invalidate();
             req.getSession();
         }
-        
+
     }
-        
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookies.java Sat Oct 22 21:23:07 2011
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.tomcat.util.http; 
+package org.apache.tomcat.util.http;
 
 import org.junit.Test;
 
@@ -30,8 +30,8 @@ public class TestCookies {
         test("foo=bar;a=b; ;", "foo", "bar", "a", "b");
         test("foo=;a=b; ;",  "a", "b");
         test("foo;a=b; ;", "a", "b");
-        // v1 
-        test("$Version=1; foo=bar;a=b", "foo", "bar", "a", "b"); 
+        // v1
+        test("$Version=1; foo=bar;a=b", "foo", "bar", "a", "b");
 
         // OK
         test("$Version=1;foo=bar;a=b; ; ",  "foo", "bar", "a", "b");
@@ -59,10 +59,10 @@ public class TestCookies {
         // Last character is an escape character
         test("$Version=1;foo=b'ar;$Domain=\"apache.org\";$Port=8080;a=\"b\\\"", "foo", "b'ar");
         test("$Version=1;foo=b'ar;$Domain=\"apache.org\";$Port=8080;a=\"b\\",  "foo", "b'ar");
-        
+
         // A token cannot be quoted with ' chars - they should be treated as part of the value
         test("$Version=\"1\"; foo='bar'; $Path=/path; $Domain=\"localhost\"", "foo", "'bar'");
-    
+
         // wrong, path should not have '/' JVK
         test("$Version=1;foo=\"bar\";$Path=/examples;a=b; ; ", "foo", "bar", "a", "b");
 
@@ -76,7 +76,7 @@ public class TestCookies {
         test("foo;a=b;bar ;", "a", "b");
 
         // Multiple delimiters next to each other
- 
+
         // BUG -- the ' ' needs to be skipped.
         test("foo;a=b; ;bar", "a", "b");
         // BUG -- ';' needs skipping
@@ -88,7 +88,7 @@ public class TestCookies {
         // '#' is a valid cookie name (not a separator)
         test("foo;a=b;;#;bar=rab","a", "b", "bar", "rab");
 
-        
+
         test("foo;a=b;;\\;bar=rab", "a", "b", "bar", "rab");
 
         // Try all the separators of version1 in version0 cookie.

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowEquals.java Sat Oct 22 21:23:07 2011
@@ -48,7 +48,7 @@ public class TestCookiesAllowEquals exte
         TestCookieEqualsClient client = new TestCookieEqualsClient();
         client.doRequest();
     }
-    
+
     private class TestCookieEqualsClient extends SimpleHttpClient {
 
 
@@ -57,12 +57,12 @@ public class TestCookiesAllowEquals exte
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Simple", new SimpleServlet());
             root.addServletMapping("/test", "Simple");
-            
+
             tomcat.start();
             // Open connection
             setPort(tomcat.getConnector().getPort());
             connect();
-            
+
             String[] request = new String[1];
             request[0] =
                 "GET /test HTTP/1.0" + CRLF +
@@ -72,7 +72,7 @@ public class TestCookiesAllowEquals exte
             setRequest(request);
             processRequest(true); // blocks until response has been read
             String response = getResponseBody();
-            
+
             // Close the connection
             disconnect();
             reset();
@@ -80,15 +80,15 @@ public class TestCookiesAllowEquals exte
             assertEquals(COOKIE_WITH_EQUALS_1 + COOKIE_WITH_EQUALS_2 +
                     COOKIE_WITH_EQUALS_3, response);
         }
-        
+
         @Override
         public boolean isResponseBodyOK() {
             return true;
         }
-        
+
     }
-    
-    
+
+
     private static class SimpleServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
@@ -103,7 +103,7 @@ public class TestCookiesAllowEquals exte
             }
             resp.flushBuffer();
         }
-        
+
     }
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowHttpSeps.java Sat Oct 22 21:23:07 2011
@@ -46,7 +46,7 @@ public class TestCookiesAllowHttpSeps ex
         TestCookieHttpSepClient client = new TestCookieHttpSepClient();
         client.doRequest();
     }
-    
+
     private class TestCookieHttpSepClient extends SimpleHttpClient {
 
 
@@ -55,12 +55,12 @@ public class TestCookiesAllowHttpSeps ex
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Simple", new SimpleServlet());
             root.addServletMapping("/test", "Simple");
-            
+
             tomcat.start();
             // Open connection
             setPort(tomcat.getConnector().getPort());
             connect();
-            
+
             String[] request = new String[1];
             request[0] =
                 "GET /test HTTP/1.0" + CRLF +
@@ -68,22 +68,22 @@ public class TestCookiesAllowHttpSeps ex
             setRequest(request);
             processRequest(true); // blocks until response has been read
             String response = getResponseBody();
-            
+
             // Close the connection
             disconnect();
             reset();
             tomcat.stop();
             assertEquals(COOKIE_WITH_SEPS, response);
         }
-        
+
         @Override
         public boolean isResponseBodyOK() {
             return true;
         }
-        
+
     }
-    
-    
+
+
     private static class SimpleServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
@@ -98,7 +98,7 @@ public class TestCookiesAllowHttpSeps ex
             }
             resp.flushBuffer();
         }
-        
+
     }
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesAllowNameOnly.java Sat Oct 22 21:23:07 2011
@@ -47,7 +47,7 @@ public class TestCookiesAllowNameOnly ex
         TestCookieNameOnlyClient client = new TestCookieNameOnlyClient();
         client.doRequest();
     }
-    
+
     private class TestCookieNameOnlyClient extends SimpleHttpClient {
 
 
@@ -56,12 +56,12 @@ public class TestCookiesAllowNameOnly ex
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Simple", new SimpleServlet());
             root.addServletMapping("/test", "Simple");
-            
+
             tomcat.start();
             // Open connection
             setPort(tomcat.getConnector().getPort());
             connect();
-            
+
             String[] request = new String[1];
             request[0] =
                 "GET /test HTTP/1.0" + CRLF +
@@ -70,7 +70,7 @@ public class TestCookiesAllowNameOnly ex
             setRequest(request);
             processRequest(true); // blocks until response has been read
             String response = getResponseBody();
-            
+
             // Close the connection
             disconnect();
             reset();
@@ -79,15 +79,15 @@ public class TestCookiesAllowNameOnly ex
             assertEquals(COOKIE_WITH_NAME_ONLY_1 + "=" +
                     COOKIE_WITH_NAME_ONLY_2, response);
         }
-        
+
         @Override
         public boolean isResponseBodyOK() {
             return true;
         }
-        
+
     }
-    
-    
+
+
     private static class SimpleServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
@@ -102,7 +102,7 @@ public class TestCookiesAllowNameOnly ex
             }
             resp.flushBuffer();
         }
-        
+
     }
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDefaultSysProps.java Sat Oct 22 21:23:07 2011
@@ -43,9 +43,9 @@ public class TestCookiesDefaultSysProps 
         Tomcat tomcat = getTomcatInstance();
 
         addServlets(tomcat);
-        
+
         tomcat.start();
-        
+
         ByteChunk res = getUrl("http://localhost:" + getPort() + "/invalid");
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/null");
@@ -68,5 +68,5 @@ public class TestCookiesDefaultSysProps 
         }
 
     }
-        
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesDisallowEquals.java Sat Oct 22 21:23:07 2011
@@ -43,7 +43,7 @@ public class TestCookiesDisallowEquals e
         TestCookieEqualsClient client = new TestCookieEqualsClient();
         client.doRequest();
     }
-    
+
     private class TestCookieEqualsClient extends SimpleHttpClient {
 
 
@@ -52,12 +52,12 @@ public class TestCookiesDisallowEquals e
             Context root = tomcat.addContext("", TEMP_DIR);
             Tomcat.addServlet(root, "Simple", new SimpleServlet());
             root.addServletMapping("/test", "Simple");
-            
+
             tomcat.start();
             // Open connection
             setPort(tomcat.getConnector().getPort());
             connect();
-            
+
             String[] request = new String[1];
             request[0] =
                 "GET /test HTTP/1.0" + CRLF +
@@ -65,22 +65,22 @@ public class TestCookiesDisallowEquals e
             setRequest(request);
             processRequest(true); // blocks until response has been read
             String response = getResponseBody();
-            
+
             // Close the connection
             disconnect();
             reset();
             tomcat.stop();
             assertEquals(COOKIE_TRUNCATED, response);
         }
-        
+
         @Override
         public boolean isResponseBodyOK() {
             return true;
         }
-        
+
     }
-    
-    
+
+
     private static class SimpleServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
@@ -95,7 +95,7 @@ public class TestCookiesDisallowEquals e
             }
             resp.flushBuffer();
         }
-        
+
     }
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java Sat Oct 22 21:23:07 2011
@@ -31,7 +31,7 @@ import org.apache.tomcat.util.buf.ByteCh
  * to facilitate this when running the unit tests via Ant.
  */
 public class TestCookiesNoFwdStrictSysProps extends CookiesBaseTest {
-    
+
     @Override
     @Test
     public void testCookiesInstance() throws Exception {
@@ -40,13 +40,13 @@ public class TestCookiesNoFwdStrictSysPr
                 "true");
         System.setProperty("org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR",
                 "false");
-        
+
         Tomcat tomcat = getTomcatInstance();
 
         addServlets(tomcat);
-        
+
         tomcat.start();
-        
+
         ByteChunk res = getUrl("http://localhost:" + getPort() + "/invalid");
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/null");
@@ -61,5 +61,5 @@ public class TestCookiesNoFwdStrictSysPr
         assertEquals("Cookie name ok", res.toString());
 
     }
-    
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoStrictNamingSysProps.java Sat Oct 22 21:23:07 2011
@@ -35,18 +35,18 @@ public class TestCookiesNoStrictNamingSy
     @Override
     @Test
     public void testCookiesInstance() throws Exception {
-    
+
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
                 "true");
         System.setProperty("org.apache.tomcat.util.http.ServerCookie.STRICT_NAMING",
                 "false");
-    
+
         Tomcat tomcat = getTomcatInstance();
-    
+
         addServlets(tomcat);
-        
+
         tomcat.start();
-        
+
         ByteChunk res = getUrl("http://localhost:" + getPort() + "/invalid");
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/null");
@@ -59,6 +59,6 @@ public class TestCookiesNoStrictNamingSy
         assertEquals("Cookie name ok", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/valid");
         assertEquals("Cookie name ok", res.toString());
-    
+
     }
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesStrictSysProps.java Sat Oct 22 21:23:07 2011
@@ -42,13 +42,13 @@ public class TestCookiesStrictSysProps e
 
         System.setProperty("org.apache.catalina.STRICT_SERVLET_COMPLIANCE",
                 "true");
-        
+
         Tomcat tomcat = getTomcatInstance();
-        
+
         addServlets(tomcat);
-        
+
         tomcat.start();
-        
+
         ByteChunk res = getUrl("http://localhost:" + getPort() + "/invalid");
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/null");
@@ -61,7 +61,7 @@ public class TestCookiesStrictSysProps e
         assertEquals("Cookie name fail", res.toString());
         res = getUrl("http://localhost:" + getPort() + "/valid");
         assertEquals("Cookie name ok", res.toString());
-        
+
         // Need to read response headers to test version switching
         Map<String,List<String>> headers = new HashMap<String,List<String>>();
         getUrl("http://localhost:" + getPort() + "/switch", res, headers);
@@ -69,7 +69,7 @@ public class TestCookiesStrictSysProps e
         for (String cookieHeader : cookieHeaders) {
             assertEquals("name=\"val?ue\"; Version=1", cookieHeader);
         }
-        
+
     }
-        
+
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapper.java Sat Oct 22 21:23:07 2011
@@ -54,7 +54,7 @@ public class TestMapper {
         String[] welcomes = new String[2];
         welcomes[0] = "boo/baba";
         welcomes[1] = "bobou";
-        
+
         mapper.addContextVersion("iowejoiejfoiew", "blah7", "",
                 "0", "context0", new String[0], null);
         mapper.addContextVersion("iowejoiejfoiew", "blah7", "/foo",
@@ -86,10 +86,10 @@ public class TestMapper {
     public void testAddHost() throws Exception {
         // Check we have the right number (add 16 but one is a duplicate)
         assertEquals(15, mapper.hosts.length);
-        
+
         // Make sure adding a duplicate *does not* overwrite
         assertEquals("blah7", mapper.hosts[3].object);
-        
+
         // Check for alphabetical order of host names
         String previous;
         String current = mapper.hosts[0].name;
@@ -150,7 +150,7 @@ public class TestMapper {
             mapper.map(host, uri, null, mappingData);
         }
         long time = System.currentTimeMillis() - start;
-        
+
         // Takes ~1s on markt's laptop. If this takes more than 4s something
         // probably needs looking at. If this fails repeatedly then we may need
         // to increase this limit.

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/mapper/TestMapperWelcomeFiles.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,7 @@ public class TestMapperWelcomeFiles exte
     public void testWelcomeFileNotStrict() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
-        
+
         File appDir = new File("test/webapp-3.0");
 
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test",
@@ -51,14 +51,14 @@ public class TestMapperWelcomeFiles exte
         ctxt.setReplaceWelcomeFiles(true);
         ctxt.addWelcomeFile("index.jsp");
         ctxt.addWelcomeFile("index.do");
-        
+
         tomcat.start();
         ByteChunk bc = new ByteChunk();
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/welcome-files", bc, new HashMap<String,List<String>>());
         assertEquals(HttpServletResponse.SC_OK, rc);
         assertTrue(bc.toString().contains("JSP"));
-        
+
         rc = getUrl("http://localhost:" + getPort() +
                 "/test/welcome-files/sub", bc,
                 new HashMap<String,List<String>>());
@@ -70,7 +70,7 @@ public class TestMapperWelcomeFiles exte
     public void testWelcomeFileStrict() throws Exception {
 
         Tomcat tomcat = getTomcatInstance();
-        
+
         File appDir = new File("test/webapp-3.0");
 
         StandardContext ctxt = (StandardContext) tomcat.addWebapp(null, "/test",
@@ -79,17 +79,17 @@ public class TestMapperWelcomeFiles exte
         ctxt.setReplaceWelcomeFiles(true);
         ctxt.addWelcomeFile("index.jsp");
         ctxt.addWelcomeFile("index.do");
-        
+
         // Simulate STRICT_SERVLET_COMPLIANCE
         ctxt.setResourceOnlyServlets("");
-        
+
         tomcat.start();
         ByteChunk bc = new ByteChunk();
         int rc = getUrl("http://localhost:" + getPort() +
                 "/test/welcome-files", bc, new HashMap<String,List<String>>());
         assertEquals(HttpServletResponse.SC_OK, rc);
         assertTrue(bc.toString().contains("JSP"));
-        
+
         rc = getUrl("http://localhost:" + getPort() +
                 "/test/welcome-files/sub", bc,
                 new HashMap<String,List<String>>());

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestClientCert.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@ public class TestClientCert extends Tomc
         ByteChunk res =
                 getUrl("https://localhost:" + getPort() + "/unprotected");
         assertEquals("OK", res.toString());
-        
+
         // Protected resource
         res = getUrl("https://localhost:" + getPort() + "/protected");
         assertEquals("OK", res.toString());
@@ -52,21 +52,21 @@ public class TestClientCert extends Tomc
     @Test
     public void testClientCertPostSmaller() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        int bodySize = tomcat.getConnector().getMaxSavePostSize() / 2; 
+        int bodySize = tomcat.getConnector().getMaxSavePostSize() / 2;
         doTestClientCertPost(bodySize, false);
     }
 
     @Test
     public void testClientCertPostSame() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        int bodySize = tomcat.getConnector().getMaxSavePostSize(); 
+        int bodySize = tomcat.getConnector().getMaxSavePostSize();
         doTestClientCertPost(bodySize, false);
     }
 
     @Test
     public void testClientCertPostLarger() throws Exception {
         Tomcat tomcat = getTomcatInstance();
-        int bodySize = tomcat.getConnector().getMaxSavePostSize() * 2; 
+        int bodySize = tomcat.getConnector().getMaxSavePostSize() * 2;
         doTestClientCertPost(bodySize, true);
     }
 
@@ -83,7 +83,7 @@ public class TestClientCert extends Tomc
         ByteChunk res = postUrl(body,
                 "https://localhost:" + getPort() + "/unprotected");
         assertEquals("OK-" + bodySize, res.toString());
-        
+
         // Protected resource
         res.recycle();
         int rc = postUrl(body, "https://localhost:" + getPort() + "/protected",
@@ -107,10 +107,10 @@ public class TestClientCert extends Tomc
         Tomcat tomcat = getTomcatInstance();
 
         TesterSupport.configureClientCertContext(tomcat);
-        
+
         // Start Tomcat
         tomcat.start();
-        
+
         TesterSupport.configureClientSsl();
     }
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -54,19 +54,19 @@ public class TestCustomSsl extends Tomca
             return;
         }
 
-        connector.setProperty("sslImplementationName", 
+        connector.setProperty("sslImplementationName",
                 "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
         connector.setProperty(TesterBug50640SslImpl.PROPERTY_NAME,
                 TesterBug50640SslImpl.PROPERTY_VALUE);
-        
+
         connector.setProperty("sslProtocol", "tls");
-        
+
         File keystoreFile =
             new File("test/org/apache/tomcat/util/net/localhost.jks");
         connector.setAttribute(
                 "keystoreFile", keystoreFile.getAbsolutePath());
 
-        connector.setSecure(true);            
+        connector.setSecure(true);
         connector.setProperty("SSLEnabled", "true");
 
         File appDir = new File(getBuildDirectory(), "webapps/examples");
@@ -87,10 +87,10 @@ public class TestCustomSsl extends Tomca
     public void testCustomTrustManager2() throws Exception {
         doTestCustomTrustManager(true);
     }
-    
+
     private void doTestCustomTrustManager(boolean serverTrustAll)
             throws Exception {
-        
+
         if (!TesterSupport.RFC_5746_SUPPORTED) {
             // Make sure SSL renegotiation is not disabled in the JVM
             System.setProperty("sun.security.ssl.allowUnsafeRenegotiation",
@@ -104,7 +104,7 @@ public class TestCustomSsl extends Tomca
         }
 
         TesterSupport.configureClientCertContext(tomcat);
-        
+
         // Override the defaults
         ProtocolHandler handler = tomcat.getConnector().getProtocolHandler();
         if (handler instanceof AbstractHttp11JsseProtocol) {
@@ -117,17 +117,17 @@ public class TestCustomSsl extends Tomca
             tomcat.getConnector().setAttribute("trustManagerClassName",
                     "org.apache.tomcat.util.net.TesterSupport$TrustAllCerts");
         }
-        
+
         // Start Tomcat
         tomcat.start();
-        
+
         TesterSupport.configureClientSsl();
 
         // Unprotected resource
         ByteChunk res =
                 getUrl("https://localhost:" + getPort() + "/unprotected");
         assertEquals("OK", res.toString());
-        
+
         // Protected resource
         res.recycle();
         int rc = -1;

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,12 +49,12 @@ public class TestSsl extends TomcatBaseT
     @Test
     public void testSimpleSsl() throws Exception {
         TesterSupport.configureClientSsl();
-        
+
         Tomcat tomcat = getTomcatInstance();
 
         File appDir = new File(getBuildDirectory(), "webapps/examples");
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-        
+
         TesterSupport.initSsl(tomcat);
 
         tomcat.start();
@@ -66,12 +66,12 @@ public class TestSsl extends TomcatBaseT
     @Test
     public void testKeyPass() throws Exception {
         TesterSupport.configureClientSsl();
-        
+
         Tomcat tomcat = getTomcatInstance();
 
         File appDir = new File(getBuildDirectory(), "webapps/examples");
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-        
+
         TesterSupport.initSsl(tomcat, "localhost-copy1.jks", "changeit",
                 "tomcatpass");
 
@@ -86,7 +86,7 @@ public class TestSsl extends TomcatBaseT
 
     @Test
     public void testRenegotiateFail() throws Exception {
-        
+
         // If RFC5746 is supported, renegotiation will always work (and will
         // always be secure)
         if (TesterSupport.RFC_5746_SUPPORTED) {
@@ -102,7 +102,7 @@ public class TestSsl extends TomcatBaseT
         TesterSupport.initSsl(tomcat);
 
         // Default - MITM attack prevented
-        
+
         tomcat.start();
         SSLContext sslCtx = SSLContext.getInstance("TLS");
         sslCtx.init(null, TesterSupport.getTrustManagers(), null);
@@ -115,12 +115,12 @@ public class TestSsl extends TomcatBaseT
                 handshakeDone = true;
             }
         });
-        
+
         OutputStream os = socket.getOutputStream();
         os.write("GET /examples/servlets/servlet/HelloWorldExample HTTP/1.0\n".getBytes());
         os.flush();
 
-        
+
         InputStream is = socket.getInputStream();
 
         // Make sure the NIO connector has read the request before the handshake
@@ -129,7 +129,7 @@ public class TestSsl extends TomcatBaseT
         socket.startHandshake();
 
         os = socket.getOutputStream();
-        
+
         try {
             os.write("Host: localhost\n\n".getBytes());
         } catch (IOException ex) {
@@ -148,7 +148,7 @@ public class TestSsl extends TomcatBaseT
             // success - we timed-out without handshake
             return;
         }
-        
+
         fail("Re-negotiation worked");
     }
 
@@ -165,7 +165,7 @@ public class TestSsl extends TomcatBaseT
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
 
         TesterSupport.initSsl(tomcat);
-        
+
         tomcat.start();
 
         SSLContext sslCtx = SSLContext.getInstance("TLS");

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestXxxEndpoint.java Sat Oct 22 21:23:07 2011
@@ -57,7 +57,7 @@ public class TestXxxEndpoint extends Tom
         }
     }
 
-    private long createAprSocket(int port, long pool) 
+    private long createAprSocket(int port, long pool)
                  throws Exception {
         /**
          * Server socket "pointer".
@@ -117,11 +117,11 @@ public class TestXxxEndpoint extends Tom
         Tomcat tomcat = getTomcatInstance();
         File appDir = new File(getBuildDirectory(), "webapps/examples");
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-        
+
         int port = getPort();
 
         tomcat.start();
-        
+
         tomcat.getConnector().stop();
         Exception e = null;
         ServerSocket s = null;
@@ -161,14 +161,14 @@ public class TestXxxEndpoint extends Tom
         Tomcat tomcat = getTomcatInstance();
         Connector c = tomcat.getConnector();
         c.setProperty("bindOnInit", "false");
-        
+
         File appDir = new File(getBuildDirectory(), "webapps/examples");
         tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-        
+
         int port = getPort();
 
         tomcat.start();
-        
+
         tomcat.getConnector().stop();
         Exception e = null;
         ServerSocket s = null;

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,7 +52,7 @@ import org.apache.catalina.startup.TestT
 import org.apache.catalina.startup.Tomcat;
 
 public final class TesterSupport {
-    
+
     protected static final boolean RFC_5746_SUPPORTED;
 
     static {
@@ -80,7 +80,7 @@ public final class TesterSupport {
     protected static void initSsl(Tomcat tomcat) {
         initSsl(tomcat, "localhost.jks", null, null);
     }
-    
+
     protected static void initSsl(Tomcat tomcat, String keystore,
             String keystorePass, String keyPass) {
 
@@ -112,10 +112,10 @@ public final class TesterSupport {
             tomcat.getConnector().setAttribute("SSLCertificateKeyFile",
                     keystoreFile.getAbsolutePath());
         }
-        tomcat.getConnector().setSecure(true);            
+        tomcat.getConnector().setSecure(true);
         tomcat.getConnector().setProperty("SSLEnabled", "true");
     }
-    
+
     protected static KeyManager[] getUser1KeyManagers() throws Exception {
         KeyManagerFactory kmf = KeyManagerFactory.getInstance(
                 KeyManagerFactory.getDefaultAlgorithm());
@@ -123,7 +123,7 @@ public final class TesterSupport {
                 "changeit".toCharArray());
         return kmf.getKeyManagers();
     }
-    
+
     protected static TrustManager[] getTrustManagers() throws Exception {
         TrustManagerFactory tmf = TrustManagerFactory.getInstance(
                 TrustManagerFactory.getDefaultAlgorithm());
@@ -142,7 +142,7 @@ public final class TesterSupport {
                     new TesterSSLSocketFactory(sc.getSocketFactory()));
         } catch (Exception e) {
             e.printStackTrace();
-        } 
+        }
     }
 
     private static KeyStore getKeyStore(String keystore) throws Exception {
@@ -163,19 +163,19 @@ public final class TesterSupport {
         }
         return ks;
     }
-    
+
     protected static boolean isRenegotiationSupported(Tomcat tomcat) {
         String protocol = tomcat.getConnector().getProtocolHandlerClassName();
         if (protocol.contains("Apr")) {
             // Disabled by default in 1.1.20 windows binary (2010-07-27)
-            return false; 
+            return false;
         }
         return true;
     }
-    
+
     protected static void configureClientCertContext(Tomcat tomcat) {
         TesterSupport.initSsl(tomcat);
-        
+
         // Need a web application with a protected and unprotected URL
         // Must have a real docBase - just use temp
         Context ctx =
@@ -198,7 +198,7 @@ public final class TesterSupport {
         realm.addUser("CN=user1, C=US", "not used");
         realm.addUserRole("CN=user1, C=US", "testrole");
         ctx.setRealm(realm);
-        
+
         // Configure the authenticator
         LoginConfig lc = new LoginConfig();
         lc.setAuthMethod("CLIENT-CERT");
@@ -211,14 +211,14 @@ public final class TesterSupport {
     public static class SimpleServlet extends HttpServlet {
 
         private static final long serialVersionUID = 1L;
-        
+
         @Override
         protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
             resp.setContentType("text/plain");
             resp.getWriter().print("OK");
         }
-        
+
         @Override
         protected void doPost(HttpServletRequest req, HttpServletResponse resp)
                 throws ServletException, IOException {
@@ -237,29 +237,29 @@ public final class TesterSupport {
             }
             // len will have been -1 on last iteration
             read++;
-            
+
             // Report the number of bytes read
             resp.setContentType("text/plain");
-            if (contentOK) 
+            if (contentOK)
                 resp.getWriter().print("OK-" + read);
             else
                 resp.getWriter().print("CONTENT-MISMATCH-" + read);
         }
     }
-    
+
     public static class TrustAllCerts implements X509TrustManager {
-        
+
         @Override
         public X509Certificate[] getAcceptedIssuers() {
             return new X509Certificate[0];
         }
-        
+
         @Override
         public void checkClientTrusted(X509Certificate[] certs,
                 String authType) {
             // NOOP - Trust everything
         }
-        
+
         @Override
         public void checkServerTrusted(X509Certificate[] certs,
                 String authType) {

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,14 +20,14 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.ServerSocketFactory;
 
 public class TesterBug50640SslImpl extends JSSEImplementation {
-    
+
     public static final String PROPERTY_NAME = "bug50640";
     public static final String PROPERTY_VALUE = "pass";
 
     @Override
     public ServerSocketFactory getServerSocketFactory(
             AbstractEndpoint endpoint)  {
-        
+
         // Check the custom attribute is visible & correcly set
         String flag = endpoint.getProperty(PROPERTY_NAME);
         if (PROPERTY_VALUE.equals(flag)) {
@@ -35,6 +35,6 @@ public class TesterBug50640SslImpl exten
         } else {
             return null;
         }
-    } 
+    }
 
 }

Modified: tomcat/trunk/test/org/apache/tomcat/util/res/TestStringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/res/TestStringManager.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/res/TestStringManager.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/res/TestStringManager.java Sat Oct 22 21:23:07 2011
@@ -29,7 +29,7 @@ public class TestStringManager {
     @Test
     public void testNullKey() {
         boolean iaeThrown = false;
-        
+
         try {
             sm.getString(null);
         } catch (IllegalArgumentException iae) {

Modified: tomcat/trunk/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java Sat Oct 22 21:23:07 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

Modified: tomcat/trunk/test/org/apache/tomcat/util/threads/TestLimitLatch.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/threads/TestLimitLatch.java?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/threads/TestLimitLatch.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/threads/TestLimitLatch.java Sat Oct 22 21:23:07 2011
@@ -93,19 +93,19 @@ public class TestLimitLatch {
     }
 
     private static class TestThread extends Thread {
-        
+
         private int holdTime;
         private LimitLatch latch;
 
         public TestThread(LimitLatch latch) {
             this(latch, 100);
         }
-        
+
         public TestThread(LimitLatch latch, int holdTime) {
             this.latch = latch;
             this.holdTime = holdTime;
         }
- 
+
         @Override
         public void run() {
             try {

Modified: tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-2.3/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -27,6 +27,6 @@
     Servlet specification and version 1.2 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/trunk/test/webapp-2.4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.4/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.4/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-2.4/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -28,6 +28,6 @@
     Servlet specification and version 2.0 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/trunk/test/webapp-2.5/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-2.5/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-2.5/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-2.5/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -28,6 +28,6 @@
     Servlet specification and version 2.1 of the JSP specification. This
     typically means ensuring that features introduced in later versions of the
     specification do not change the behaviour of applications that declared an
-    earlier version of the specification. 
+    earlier version of the specification.
   </description>
 </web-app>
\ No newline at end of file

Modified: tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0-fragments/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -20,26 +20,26 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="false">  
+  metadata-complete="false">
 
   <display-name>Tomcat Test Application</display-name>
   <description>
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <servlet>
     <servlet-name>AllowByAnnotation</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$SubclassAllowAllServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>AllowByAnnotation</servlet-name>
-    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>  
+    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
   </servlet-mapping>
   <security-constraint>
     <auth-constraint/>
     <web-resource-collection>
-    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>  
+    <url-pattern>/testStandardWrapper/securityAnnotationsWebXmlPriority</url-pattern>
     </web-resource-collection>
   </security-constraint>
 

Modified: tomcat/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0-servletsecurity/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -19,7 +19,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  version="3.0">  
+  version="3.0">
 
   <!--
     WARNING:
@@ -34,7 +34,7 @@
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <servlet>
     <servlet-name>RoleProtected</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$RoleAllowServlet</servlet-class>

Modified: tomcat/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0-servletsecurity2/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -20,7 +20,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="true">  
+  metadata-complete="true">
 
   <!--
     WARNING:
@@ -33,7 +33,7 @@
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <security-constraint>
     <auth-constraint/>
     <web-resource-collection>

Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld Sat Oct 22 21:23:07 2011
@@ -34,7 +34,7 @@
     <tei-class>org.apache.jasper.compiler.TestScriptingVariabler$Bug48616bTei</tei-class>
     <body-content>JSP</body-content>
   </tag>
-  
+
   <tag>
     <name>Bug48701a</name>
     <tag-class>org.apache.jasper.compiler.TestGenerator$Bug48701</tag-class>

Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/test.tld
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/test.tld?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/test.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/test.tld Sat Oct 22 21:23:07 2011
@@ -23,7 +23,7 @@
   <tlib-version>1.0</tlib-version>
   <short-name>TesterFunctions</short-name>
   <uri>http://tomcat.apache.org/testerFunctions</uri>
-  
+
   <function>
     <name>trim</name>
     <function-class>org.apache.el.TesterFunctions</function-class>

Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Sat Oct 22 21:23:07 2011
@@ -20,14 +20,14 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
                       http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0"
-  metadata-complete="true">  
+  metadata-complete="true">
 
   <display-name>Tomcat Test Application</display-name>
   <description>
      Used as part of the Tomcat unit tests when a full web application is
      required.
   </description>
-  
+
   <!--  Bug 49922 -->
   <filter>
     <filter-name>Bug49922</filter-name>
@@ -95,7 +95,7 @@
     <servlet-name>Bug49922</servlet-name>
     <url-pattern>*.od</url-pattern>
   </servlet-mapping>
-  
+
   <jsp-config>
     <jsp-property-group>
       <default-content-type>text/plain</default-content-type>
@@ -103,14 +103,14 @@
       <url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
     </jsp-property-group>
   </jsp-config>
-  
+
   <servlet>
     <servlet-name>DenyByAnnotation</servlet-name>
     <servlet-class>org.apache.catalina.core.TestStandardWrapper$DenyAllServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>DenyByAnnotation</servlet-name>
-    <url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>  
+    <url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>
   </servlet-mapping>
 
   <login-config>

Modified: tomcat/trunk/test/webapp-3.0/bug47413.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug47413.jsp?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug47413.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug47413.jsp Sat Oct 22 21:23:07 2011
@@ -26,11 +26,11 @@
     <jsp:setProperty name="values" property="doubleValue" value="${1+2}.${220}"/>
     <p>02-${values.doubleValue}</p>
     <tags:echo-double index="03" echo="${1+2}.${220}"/>
-    
+
     <jsp:setProperty name="values" property="longValue" value="000${1}${7}"/>
     <p>04-${values.longValue}</p>
     <tags:echo-long index="05" echo="000${1}${7}"/>
-    
+
     <jsp:setProperty name="values" property="stringValue"
                      value="${undefinedFoo}hello world${undefinedBar}"/>
     <p>06-${values.stringValue}</p>

Modified: tomcat/trunk/test/webapp-3.0/echo-params.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/echo-params.jsp?rev=1187806&r1=1187805&r2=1187806&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/echo-params.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/echo-params.jsp Sat Oct 22 21:23:07 2011
@@ -21,7 +21,7 @@
 Enumeration<String> params = request.getParameterNames();
 while (params.hasMoreElements()) {
     String param = params.nextElement();
-    
+
     String[] values = request.getParameterValues(param);
     for (String value : values) {
         // Don't do this in a real webapp - XSS issues



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


Mime
View raw message