Author: kkolinko
Date: Tue Sep 2 16:31:26 2014
New Revision: 1622061
URL: http://svn.apache.org/r1622061
Log:
svn:eol-style = native
Modified:
tomcat/trunk/test/webapp/jsp/pageContext1.jsp (contents, props changed)
tomcat/trunk/test/webapp/jsp/pageContext2.jsp (contents, props changed)
Modified: tomcat/trunk/test/webapp/jsp/pageContext1.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/pageContext1.jsp?rev=1622061&r1=1622060&r2=1622061&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/pageContext1.jsp (original)
+++ tomcat/trunk/test/webapp/jsp/pageContext1.jsp Tue Sep 2 16:31:26 2014
@@ -1,39 +1,39 @@
-<%--
- 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.
---%>
-<%@ page import="java.io.IOException" contentType="text/plain"%>
-<%
- boolean flush = Boolean.valueOf(request.getParameter("flush"));
- if (pageContext != null) {
- try {
- if (flush) {
- out.println("Flush");
- pageContext.include("/jsp/pageContext2.jsp", true);
- } else {
- pageContext.include("/jsp/pageContext2.jsp");
- }
- } catch (IOException e) {
- out.println("OK");
- return;
- } catch (Throwable t) {
- out.println("FAILED. Expected IOException, received: " +
t.getClass().getName());
- return;
- }
- out.println("FAILED. Expected IOException.");
- } else {
- out.println("FAILED. Expected IOException.");
- }
+<%--
+ 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.
+--%>
+<%@ page import="java.io.IOException" contentType="text/plain"%>
+<%
+ boolean flush = Boolean.valueOf(request.getParameter("flush"));
+ if (pageContext != null) {
+ try {
+ if (flush) {
+ out.println("Flush");
+ pageContext.include("/jsp/pageContext2.jsp", true);
+ } else {
+ pageContext.include("/jsp/pageContext2.jsp");
+ }
+ } catch (IOException e) {
+ out.println("OK");
+ return;
+ } catch (Throwable t) {
+ out.println("FAILED. Expected IOException, received: " +
t.getClass().getName());
+ return;
+ }
+ out.println("FAILED. Expected IOException.");
+ } else {
+ out.println("FAILED. Expected IOException.");
+ }
%>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/pageContext1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/test/webapp/jsp/pageContext2.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/pageContext2.jsp?rev=1622061&r1=1622060&r2=1622061&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/pageContext2.jsp (original)
+++ tomcat/trunk/test/webapp/jsp/pageContext2.jsp Tue Sep 2 16:31:26 2014
@@ -1,18 +1,18 @@
-<%--
- 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.
---%>
-<%@ page import="java.io.IOException" contentType="text/plain"%>
+<%--
+ 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.
+--%>
+<%@ page import="java.io.IOException" contentType="text/plain"%>
<% throw new IOException("Throws IOException."); %>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/pageContext2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
