tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1428283 - in /tomcat/trunk/test: org/apache/jasper/runtime/TestJspWriterImpl.java webapp-3.0/bug5nnnn/bug54241a.jsp webapp-3.0/bug5nnnn/bug54241b.jsp
Date Thu, 03 Jan 2013 11:14:36 GMT
Author: markt
Date: Thu Jan  3 11:14:35 2013
New Revision: 1428283

URL: http://svn.apache.org/viewvc?rev=1428283&view=rev
Log:
Line endings

Modified:
    tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java   (contents, props
changed)
    tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp   (contents, props changed)
    tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp   (contents, props changed)

Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java?rev=1428283&r1=1428282&r2=1428283&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java (original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java Thu Jan  3 11:14:35
2013
@@ -1,70 +1,70 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jasper.runtime;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
-
-public class TestJspWriterImpl extends TomcatBaseTest {
-
-    @Test
-    public void bug54241a() throws Exception {
-        Tomcat tomcat = getTomcatInstance();
-
-        File appDir = new File("test/webapp-3.0");
-        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-        tomcat.start();
-
-        ByteChunk res = new ByteChunk();
-
-        int rc = getUrl("http://localhost:" + getPort() +
-                "/test/bug5nnnn/bug54241a.jsp", res, null);
-
-        Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-
-        String body = res.toString();
-        Assert.assertTrue(body.contains("01: null"));
-        Assert.assertTrue(body.contains("02: null"));
-    }
-
-    @Test
-    public void bug54241b() throws Exception {
-        Tomcat tomcat = getTomcatInstance();
-
-        File appDir = new File("test/webapp-3.0");
-        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-        tomcat.start();
-
-        ByteChunk res = new ByteChunk();
-
-        int rc = getUrl("http://localhost:" + getPort() +
-                "/test/bug5nnnn/bug54241b.jsp", res, null);
-
-        Assert.assertEquals(res.toString(),
-                HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.runtime;
+
+import java.io.File;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspWriterImpl extends TomcatBaseTest {
+
+    @Test
+    public void bug54241a() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        File appDir = new File("test/webapp-3.0");
+        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+        tomcat.start();
+
+        ByteChunk res = new ByteChunk();
+
+        int rc = getUrl("http://localhost:" + getPort() +
+                "/test/bug5nnnn/bug54241a.jsp", res, null);
+
+        Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+
+        String body = res.toString();
+        Assert.assertTrue(body.contains("01: null"));
+        Assert.assertTrue(body.contains("02: null"));
+    }
+
+    @Test
+    public void bug54241b() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        File appDir = new File("test/webapp-3.0");
+        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+        tomcat.start();
+
+        ByteChunk res = new ByteChunk();
+
+        int rc = getUrl("http://localhost:" + getPort() +
+                "/test/bug5nnnn/bug54241b.jsp", res, null);
+
+        Assert.assertEquals(res.toString(),
+                HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc);
+    }
+}

Propchange: tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp?rev=1428283&r1=1428282&r2=1428283&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp Thu Jan  3 11:14:35 2013
@@ -1,28 +1,28 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-<html>
-  <body>
-    <%
-      String nullString = null;
-    %>
-    <!-- JspWriter.print(Object obj) is defined to print String.valueOf(obj)
-         which is "null" if obj is null -->
-    <p>01: <%= (Object) null %></p>
-    <!-- JspWriter.print(String) is defined to print null for a null String -->
-    <p>02: <%= nullString %></p>
-  </body>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<html>
+  <body>
+    <%
+      String nullString = null;
+    %>
+    <!-- JspWriter.print(Object obj) is defined to print String.valueOf(obj)
+         which is "null" if obj is null -->
+    <p>01: <%= (Object) null %></p>
+    <!-- JspWriter.print(String) is defined to print null for a null String -->
+    <p>02: <%= nullString %></p>
+  </body>
 </html>
\ No newline at end of file

Propchange: tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241a.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp?rev=1428283&r1=1428282&r2=1428283&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp Thu Jan  3 11:14:35 2013
@@ -1,34 +1,34 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
-<%!
-  class Bug54241 {
-    public String toString() {
-      return null;
-    }
-  }
-%>
-<html>
-  <body>
-    <%
-      Bug54241 bug54241 = new Bug54241();
-    %>
-    <!-- JspWriter.print(Object obj) is defined to print String.valueOf(obj)
-         which is obj.toString() if obj is non-null. If obj.toString is null
-         then this will trigger a NullPointerException -->
-    <p>01: <%= bug54241 %></p>
-  </body>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  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.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%!
+  class Bug54241 {
+    public String toString() {
+      return null;
+    }
+  }
+%>
+<html>
+  <body>
+    <%
+      Bug54241 bug54241 = new Bug54241();
+    %>
+    <!-- JspWriter.print(Object obj) is defined to print String.valueOf(obj)
+         which is obj.toString() if obj is non-null. If obj.toString is null
+         then this will trigger a NullPointerException -->
+    <p>01: <%= bug54241 %></p>
+  </body>
 </html>
\ No newline at end of file

Propchange: tomcat/trunk/test/webapp-3.0/bug5nnnn/bug54241b.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



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


Mime
View raw message