Author: kkolinko
Date: Thu Mar 4 08:49:38 2010
New Revision: 918895
URL: http://svn.apache.org/viewvc?rev=918895&view=rev
Log:
svn:eol-style, no functional change
(followup to r918682)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
(contents, props changed)
tomcat/trunk/test/webapp/bug47977.jspx (contents, props changed)
tomcat/trunk/test/webapp/bug48827.jspx (contents, props changed)
Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java?rev=918895&r1=918894&r2=918895&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
(original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java Thu
Mar 4 08:49:38 2010
@@ -1,69 +1,69 @@
-/*
- * 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);
- }
-}
+/*
+ * 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);
+ }
+}
Propchange:
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/test/webapp/bug47977.jspx
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug47977.jspx?rev=918895&r1=918894&r2=918895&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/bug47977.jspx (original)
+++ tomcat/trunk/test/webapp/bug47977.jspx Thu Mar 4 08:49:38 2010
@@ -1,26 +1,26 @@
-<!--
- 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>
+<!--
+ 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
Propchange: tomcat/trunk/test/webapp/bug47977.jspx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/test/webapp/bug48827.jspx
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug48827.jspx?rev=918895&r1=918894&r2=918895&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/bug48827.jspx (original)
+++ tomcat/trunk/test/webapp/bug48827.jspx Thu Mar 4 08:49:38 2010
@@ -1,30 +1,30 @@
-<!--
- 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>
+<!--
+ 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
Propchange: tomcat/trunk/test/webapp/bug48827.jspx
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
