svn:eol-style, no functional change

(followup to r918682)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918895 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
index af8fccd..a0e87b6 100644 (file)
--- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java
+++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java
@@ -1,69 +1,69 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.apache.jasper.compiler;\r
-\r
-import java.io.File;\r
-import java.io.IOException;\r
-\r
-import org.apache.catalina.startup.Tomcat;\r
-import org.apache.catalina.startup.TomcatBaseTest;\r
-\r
-public class TestJspDocumentParser extends TomcatBaseTest {\r
-    \r
-    public void testBug47977() throws Exception {\r
-        Tomcat tomcat = getTomcatInstance();\r
-\r
-        File appDir = \r
-            new File("test/webapp");\r
-        // app dir is relative to server home\r
-        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());\r
-        \r
-        tomcat.start();\r
-\r
-        Exception e = null;\r
-        try {\r
-            getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx");\r
-        } catch (IOException ioe) {\r
-            e = ioe;\r
-        }\r
-\r
-        // Failure is expected\r
-        assertNotNull(e);\r
-    }\r
-    \r
-    public void testBug48827() throws Exception {\r
-        Tomcat tomcat = getTomcatInstance();\r
-\r
-        File appDir = \r
-            new File("test/webapp");\r
-        // app dir is relative to server home\r
-        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());\r
-        \r
-        tomcat.start();\r
-\r
-        Exception e = null;\r
-        try {\r
-            getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx");\r
-        } catch (IOException ioe) {\r
-            e = ioe;\r
-        }\r
-\r
-        // Should not fail\r
-        assertNull(e);\r
-    }\r
-}\r
+/*
+ * 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.compiler;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestJspDocumentParser extends TomcatBaseTest {
+    
+    public void testBug47977() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        File appDir = 
+            new File("test/webapp");
+        // app dir is relative to server home
+        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+        
+        tomcat.start();
+
+        Exception e = null;
+        try {
+            getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx");
+        } catch (IOException ioe) {
+            e = ioe;
+        }
+
+        // Failure is expected
+        assertNotNull(e);
+    }
+    
+    public void testBug48827() throws Exception {
+        Tomcat tomcat = getTomcatInstance();
+
+        File appDir = 
+            new File("test/webapp");
+        // app dir is relative to server home
+        tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+        
+        tomcat.start();
+
+        Exception e = null;
+        try {
+            getUrl("http://localhost:" + getPort() + "/test/bug48827.jspx");
+        } catch (IOException ioe) {
+            e = ioe;
+        }
+
+        // Should not fail
+        assertNull(e);
+    }
+}

diff --git a/test/webapp/bug47977.jspx b/test/webapp/bug47977.jspx
index a04162a..082e8f1 100644 (file)
--- a/test/webapp/bug47977.jspx
+++ b/test/webapp/bug47977.jspx
@@ -1,26 +1,26 @@
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<jsp:root\r
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"\r
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >\r
-  <jsp:directive.page isELIgnored="false" />\r
-<html>\r
-  <body>\r
-    <tags:echo echo="00-Hello World">xxx</tags:echo>\r
-  </body>\r
-</html>\r
+<!--
+  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.
+-->
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <tags:echo echo="00-Hello World">xxx</tags:echo>
+  </body>
+</html>
 </jsp:root>
\ No newline at end of file

diff --git a/test/webapp/bug48827.jspx b/test/webapp/bug48827.jspx
index 1060d9a..a6c760e 100644 (file)
--- a/test/webapp/bug48827.jspx
+++ b/test/webapp/bug48827.jspx
@@ -1,30 +1,30 @@
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<jsp:root\r
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"\r
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >\r
-  <jsp:directive.page isELIgnored="false" />\r
-<html>\r
-  <body>\r
-    <tags:echo>\r
-      <jsp:attribute name="echo">00-Hello World</jsp:attribute>\r
-    </tags:echo>\r
-    <tags:echo echo="01-Hello World"></tags:echo>\r
-    <tags:echo echo="02-Hello World"> </tags:echo>\r
-  </body>\r
-</html>\r
+<!--
+  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.
+-->
+<jsp:root
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <tags:echo>
+      <jsp:attribute name="echo">00-Hello World</jsp:attribute>
+    </tags:echo>
+    <tags:echo echo="01-Hello World"></tags:echo>
+    <tags:echo echo="02-Hello World"> </tags:echo>
+  </body>
+</html>
 </jsp:root>
\ No newline at end of file