Author: markt
Date: Mon Jan 10 07:43:34 2011
New Revision: 1057100
URL: http://svn.apache.org/viewvc?rev=1057100&view=rev
Log:
Configure Checkstyle to allow limited static imports and revert most of r1056947
Modified:
tomcat/trunk/res/checkstyle/checkstyle.xml
tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
Modified: tomcat/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1057100&r1=1057099&r2=1057100&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Mon Jan 10 07:43:34 2011
@@ -37,7 +37,10 @@
<!-- Imports -->
<module name="AvoidStarImport"/>
- <module name="AvoidStaticImport"/>
+ <module name="AvoidStaticImport">
+ <property name="excludes"
+ value="org.apache.catalina.startup.SimpleHttpClient.CRLF"/>
+ </module>
<module name="IllegalImport"/>
<module name="ImportOrder">
<property name="groups" value="java,javax,async,jsp2,junit,org,util"/>
Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1057100&r1=1057099&r2=1057100&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Mon
Jan 10 07:43:34 2011
@@ -30,6 +30,8 @@ import java.util.TimeZone;
import javax.servlet.http.HttpServletResponse;
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
@@ -186,8 +188,8 @@ public class TestDefaultServlet extends
client.setPort(getPort());
client.reset();
- client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
- SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
+ client.setRequest(new String[] {
+ "GET /MyApp/missing HTTP/1.0" +CRLF + CRLF });
client.connect();
client.processRequest();
assertTrue(client.isResponse404());
@@ -203,11 +205,10 @@ public class TestDefaultServlet extends
//
client.reset();
client.setRequest(new String[] {
- "GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
- "Host: localhost" + SimpleHttpClient.CRLF +
- "Connection: close" + SimpleHttpClient.CRLF +
- "If-Modified-Since: " + tomorrow + SimpleHttpClient.CRLF +
- SimpleHttpClient.CRLF });
+ "GET /MyApp/missing HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: close" + CRLF +
+ "If-Modified-Since: " + tomorrow + CRLF + CRLF });
client.connect();
client.processRequest();
assertTrue(client.isResponse404());
@@ -217,11 +218,10 @@ public class TestDefaultServlet extends
//
client.reset();
client.setRequest(new String[] {
- "GET /MyApp/missing HTTP/1.1" + SimpleHttpClient.CRLF +
- "Host: localhost" + SimpleHttpClient.CRLF +
- "Connection: close" + SimpleHttpClient.CRLF +
- "Range: bytes=0-100" + SimpleHttpClient.CRLF +
- SimpleHttpClient.CRLF });
+ "GET /MyApp/missing HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: close" + CRLF +
+ "Range: bytes=0-100" + CRLF + CRLF });
client.connect();
client.processRequest();
assertTrue(client.isResponse404());
@@ -261,8 +261,8 @@ public class TestDefaultServlet extends
client.setPort(getPort());
client.reset();
- client.setRequest(new String[] { "GET /MyApp/missing HTTP/1.0" +
- SimpleHttpClient.CRLF + SimpleHttpClient.CRLF });
+ client.setRequest(new String[] {
+ "GET /MyApp/missing HTTP/1.0" + CRLF + CRLF });
client.connect();
client.processRequest();
assertTrue(client.isResponse404());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
