From 7f1dd88dd7fcce1135cbe4ef4843969311ade69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sun, 16 Jul 2023 12:14:58 +0200 Subject: [PATCH] Removed two files which were copy pasted in web_jsp tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Seems that these files were originally used to test the redeployment manually, Signed-off-by: David Matějček --- .../java/org/apache/jsp/jsp/test_jsp.java | 74 ------------------- .../org/apache/jsp/nullErrorPage_jsp.java | 68 ----------------- 2 files changed, 142 deletions(-) delete mode 100644 appserver/web/web-glue/src/main/java/org/apache/jsp/jsp/test_jsp.java delete mode 100644 appserver/web/web-glue/src/main/java/org/apache/jsp/nullErrorPage_jsp.java diff --git a/appserver/web/web-glue/src/main/java/org/apache/jsp/jsp/test_jsp.java b/appserver/web/web-glue/src/main/java/org/apache/jsp/jsp/test_jsp.java deleted file mode 100644 index 10756cf7fd0..00000000000 --- a/appserver/web/web-glue/src/main/java/org/apache/jsp/jsp/test_jsp.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0, which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.apache.jsp.jsp; - -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import jakarta.servlet.jsp.*; - -public final class test_jsp extends org.glassfish.wasp.runtime.HttpJspBase implements org.glassfish.wasp.runtime.JspSourceDependent { - - private static final JspFactory _jspxFactory = JspFactory.getDefaultFactory(); - - private static java.util.List _jspx_dependants; - - private org.glassfish.jsp.api.ResourceInjector _jspx_resourceInjector; - - public java.util.List getDependants() { - return _jspx_dependants; - } - - public void _jspService(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException, ServletException { - - PageContext pageContext = null; - HttpSession session = null; - ServletContext application = null; - ServletConfig config = null; - JspWriter out = null; - Object page = this; - JspWriter _jspx_out = null; - PageContext _jspx_page_context = null; - - try { - response.setContentType("text/html"); - response.setHeader("X-Powered-By", "JSP/2.3"); - pageContext = _jspxFactory.getPageContext(this, request, response, null, true, 8192, true); - _jspx_page_context = pageContext; - application = pageContext.getServletContext(); - config = pageContext.getServletConfig(); - session = pageContext.getSession(); - out = pageContext.getOut(); - _jspx_out = out; - _jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) - application.getAttribute("com.sun.appserv.jsp.resource.injector"); - - out.write("This is my UPDATED output\n\n"); - } catch (Throwable t) { - if (!(t instanceof SkipPageException)) { - out = _jspx_out; - if (out != null && out.getBufferSize() != 0) - out.clearBuffer(); - if (_jspx_page_context != null) - _jspx_page_context.handlePageException(t); - else - throw new ServletException(t); - } - } finally { - _jspxFactory.releasePageContext(_jspx_page_context); - } - } -} diff --git a/appserver/web/web-glue/src/main/java/org/apache/jsp/nullErrorPage_jsp.java b/appserver/web/web-glue/src/main/java/org/apache/jsp/nullErrorPage_jsp.java deleted file mode 100644 index c5ae17800cf..00000000000 --- a/appserver/web/web-glue/src/main/java/org/apache/jsp/nullErrorPage_jsp.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.apache.jsp; - -import jakarta.servlet.*; -import jakarta.servlet.http.*; -import jakarta.servlet.jsp.*; - -public final class nullErrorPage_jsp extends org.glassfish.wasp.runtime.HttpJspBase - implements org.glassfish.wasp.runtime.JspSourceDependent { - - private static final JspFactory _jspxFactory = JspFactory.getDefaultFactory(); - - private static java.util.List _jspx_dependants; - - private org.glassfish.jsp.api.ResourceInjector _jspx_resourceInjector; - - public java.util.List getDependants() { - return _jspx_dependants; - } - - public void _jspService(HttpServletRequest request, HttpServletResponse response) - throws java.io.IOException, ServletException { - - PageContext pageContext = null; - HttpSession session = null; - Throwable exception = org.glassfish.wasp.runtime.JspRuntimeLibrary.getThrowable(request); - if (exception != null) { - response.setStatus((Integer)request.getAttribute("jakarta.servlet.error.status_code")); - } - ServletContext application = null; - ServletConfig config = null; - JspWriter out = null; - Object page = this; - JspWriter _jspx_out = null; - PageContext _jspx_page_context = null; - - try { - response.setContentType("text/html"); - response.setHeader("X-Powered-By", "JSP/3.0"); - pageContext = _jspxFactory.getPageContext(this, request, response, - null, true, 8192, true); - _jspx_page_context = pageContext; - application = pageContext.getServletContext(); - config = pageContext.getServletConfig(); - session = pageContext.getSession(); - out = pageContext.getOut(); - _jspx_out = out; - _jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) application.getAttribute("com.sun.appserv.jsp.resource.injector"); - - out.write("\n"); - out.write("\n"); - out.write("\n"); - out.write((java.lang.String) org.glassfish.wasp.runtime.PageContextImpl.evaluateExpression("${pageContext.exception}", java.lang.String.class, (PageContext)_jspx_page_context, null)); - out.write('\n'); - out.write((java.lang.String) org.glassfish.wasp.runtime.PageContextImpl.evaluateExpression("${pageContext.errorData.throwable}", java.lang.String.class, (PageContext)_jspx_page_context, null)); - out.write('\n'); - } catch (Throwable t) { - if (!(t instanceof SkipPageException)){ - out = _jspx_out; - if (out != null && out.getBufferSize() != 0) - out.clearBuffer(); - if (_jspx_page_context != null) _jspx_page_context.handlePageException(t); - else throw new ServletException(t); - } - } finally { - _jspxFactory.releasePageContext(_jspx_page_context); - } - } -}