Author: markt
Date: Fri Jun 1 09:08:37 2012
New Revision: 1345021
URL: http://svn.apache.org/viewvc?rev=1345021&view=rev
Log:
Fix checkstyle warnings in Ant build
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1345020
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1345021&r1=1345020&r2=1345021&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Jun 1 09:08:37 2012
@@ -467,6 +467,9 @@
<!-- Exclude these else Gump runs validate on them -->
<exclude name="**/org/apache/tomcat/dbcp/**"/>
<exclude name="**/tomcat-deps/**"/>
+ <!-- Exclude simple test files -->
+ <exclude name="test/webapp-3.0/bug53257/*.txt"/>
+ <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
</fileset>
<fileset dir="modules/jdbc-pool" >
<exclude name=".*/**"/>
Modified: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp?rev=1345021&r1=1345020&r2=1345021&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-3.0/bug53257/index.jsp Fri Jun 1 09:08:37
2012
@@ -13,7 +13,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%@page contentType="text/plain; charset=UTF-8"
+--%>
+<%@page contentType="text/plain; charset=UTF-8"
%><%@page import="java.net.URL,java.net.URLConnection"%><%
String[] testFiles = new String[] {"foo;bar.txt", "foo&bar.txt",
"foo#bar.txt", "foo%bar.txt", "foo+bar.txt"};
@@ -22,13 +23,13 @@
if (url == null) {
out.print("FAIL (url) - " + testFile + "\n");
} else {
- URLConnection conn = url.openConnection();
- long lastModified = conn.getLastModified();
- if (lastModified == -1) {
- out.print("FAIL (last modified)- " + testFile + "\n");
- } else {
- out.print("PASS - " + testFile + "\n");
- }
+ URLConnection conn = url.openConnection();
+ long lastModified = conn.getLastModified();
+ if (lastModified == -1) {
+ out.print("FAIL (last modified)- " + testFile + "\n");
+ } else {
+ out.print("PASS - " + testFile + "\n");
+ }
}
}
%>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
