From d85662bd6e2a56bbbb8f753fede2036dfeba740f Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 18 Feb 2015 19:24:29 +1100 Subject: [PATCH] 459681 Remove Glassfish JSP in favor of Apache JSP --- .../modules/{jsp-impl => }/apache-jsp.mod | 0 .../modules/{jsp-impl => }/apache-jstl.mod | 0 jetty-ant/pom.xml | 2 +- jetty-distribution/pom.xml | 55 +-------- .../src/main/resources/modules/jsp.mod | 14 +-- .../src/main/resources/modules/jstl.mod | 8 +- jetty-jsp/pom.xml | 90 --------------- .../config/modules/jsp-impl/glassfish-jsp.mod | 8 -- .../modules/jsp-impl/glassfish-jstl.mod | 6 - .../eclipse/jetty/jsp/JettyJspServlet.java | 107 ------------------ jetty-jsp/src/main/resources/readme.txt | 4 - jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 21 ---- jetty-osgi/test-jetty-osgi/pom.xml | 40 ++++++- jetty-runner/pom.xml | 7 +- pom.xml | 72 ------------ tests/test-integration/pom.xml | 2 +- 16 files changed, 47 insertions(+), 389 deletions(-) rename apache-jsp/src/main/config/modules/{jsp-impl => }/apache-jsp.mod (100%) rename apache-jstl/src/main/config/modules/{jsp-impl => }/apache-jstl.mod (100%) delete mode 100644 jetty-jsp/pom.xml delete mode 100644 jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod delete mode 100644 jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod delete mode 100644 jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java delete mode 100644 jetty-jsp/src/main/resources/readme.txt diff --git a/apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod similarity index 100% rename from apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod rename to apache-jsp/src/main/config/modules/apache-jsp.mod diff --git a/apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod b/apache-jstl/src/main/config/modules/apache-jstl.mod similarity index 100% rename from apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod rename to apache-jstl/src/main/config/modules/apache-jstl.mod diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index 64205ba7adf..fad1e91a9f7 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -26,7 +26,7 @@ org.eclipse.jetty org.eclipse.jetty.orbit,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts - jetty-all,jetty-start,jetty-monitor,jetty-jsp + jetty-all,jetty-start,jetty-monitor jar ${project.build.directory}/test-lib diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index d8fc9d3c376..e24f9b41537 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -302,7 +302,7 @@ org.eclipse.jetty org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - jetty-all,jetty-jsp,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring + jetty-all,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring jar ${assembly-directory}/lib @@ -444,19 +444,6 @@ ${assembly-directory}/lib/jndi - - copy-glassfish-jsp-deps - generate-resources - - copy-dependencies - - - org.eclipse.jetty.orbit,org.glassfish.web, org.glassfish, javax.el, javax.servlet.jsp, org.eclipse.jetty.toolchain, org.eclipse.jetty - org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, jetty-jsp-jdt, javax.el-api, javax.el, jetty-jsp - jar - ${assembly-directory}/lib/jsp - - copy-apache-jsp-deps generate-resources @@ -485,19 +472,6 @@ ${assembly-directory}/lib/jsp - - copy-jstl-impl - generate-resources - - copy-dependencies - - - org.glassfish.web - javax.servlet.jsp.jstl - jar - ${assembly-directory}/lib/jsp - - copy-apache-jstl-deps generate-resources @@ -649,28 +623,6 @@ javax.transaction-api - - org.glassfish.web - javax.servlet.jsp.jstl - - - - org.glassfish.web - javax.servlet.jsp - - - org.eclipse.jetty.toolchain - jetty-jsp-jdt - - - javax.servlet.jsp - javax.servlet.jsp-api - - - org.glassfish - javax.el - - org.ow2.asm asm @@ -738,11 +690,6 @@ javax-websocket-server-impl ${project.version} - - org.eclipse.jetty - jetty-jsp - ${project.version} - org.eclipse.jetty apache-jsp diff --git a/jetty-distribution/src/main/resources/modules/jsp.mod b/jetty-distribution/src/main/resources/modules/jsp.mod index bb31ca75992..a16cc93dc93 100644 --- a/jetty-distribution/src/main/resources/modules/jsp.mod +++ b/jetty-distribution/src/main/resources/modules/jsp.mod @@ -5,17 +5,5 @@ [depend] servlet annotations -jsp-impl/${jsp-impl}-jsp +apache-jsp -[ini-template] -# JSP Configuration - -# Select JSP implementation, choices are -# glassfish : The reference implementation -# default in jetty <= 9.1 -# apache : The apache version -# default jetty >= 9.2 -jsp-impl=apache - -# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line -# -Dorg.apache.jasper.compiler.disablejsr199=true diff --git a/jetty-distribution/src/main/resources/modules/jstl.mod b/jetty-distribution/src/main/resources/modules/jstl.mod index 4694389b995..efc310af6e9 100644 --- a/jetty-distribution/src/main/resources/modules/jstl.mod +++ b/jetty-distribution/src/main/resources/modules/jstl.mod @@ -4,11 +4,5 @@ [depend] jsp -jsp-impl/${jsp-impl}-jstl +apache-jstl -[ini-template] -# JSTL Configuration -# The glassfish jsp-impl includes JSTL by default and this module -# is not required to activate it. -# The apache jsp-impl does not include JSTL by default and this module -# is required to put JSTL on the container classpath diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml deleted file mode 100644 index 8799f1e9558..00000000000 --- a/jetty-jsp/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - org.eclipse.jetty - jetty-project - 9.3.0-SNAPSHOT - - 4.0.0 - jetty-jsp - Jetty :: Glassfish JSP Implementation - http://www.eclipse.org/jetty - jar - - ${project.groupId}.glassfish.jsp.parent - - - - - - - - - - org.eclipse.jetty - jetty-util - ${project.version} - provided - - - org.eclipse.jetty - jetty-server - ${project.version} - provided - - - - - org.eclipse.jetty.toolchain - jetty-schemas - - - - - javax.servlet - javax.servlet-api - - - - - javax.servlet.jsp - javax.servlet.jsp-api - - - - org.glassfish.web - javax.servlet.jsp - - - - - org.eclipse.jetty.orbit - javax.servlet.jsp.jstl - - - - org.glassfish.web - javax.servlet.jsp.jstl - - - - - - - - org.glassfish - javax.el - - - - - - org.eclipse.jetty.orbit - org.eclipse.jdt.core - - - diff --git a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod b/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod deleted file mode 100644 index 130d2b371f4..00000000000 --- a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod +++ /dev/null @@ -1,8 +0,0 @@ -# -# Glassfish JSP Module -# -[name] -jsp-impl - -[lib] -lib/jsp/*.jar diff --git a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod b/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod deleted file mode 100644 index 4b8e6f360c0..00000000000 --- a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod +++ /dev/null @@ -1,6 +0,0 @@ -# -# Glassfish JSTL -[name] -jstl-impl - -# This file is empty as glassfish jstl is provided by glassfish jsp diff --git a/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java b/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java deleted file mode 100644 index 05a9d517333..00000000000 --- a/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java +++ /dev/null @@ -1,107 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.jsp; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.jasper.servlet.JspServlet; -import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.URIUtil; -import org.eclipse.jetty.util.resource.Resource; - - -/** - * JettyJspServlet - * - * Wrapper for the jsp servlet that handles receiving requests mapped from - * jsp-property-groups. Mappings could be wildcard urls like "/*", which would - * include welcome files, but we need those to be handled by the DefaultServlet. - */ -public class JettyJspServlet extends JspServlet -{ - - /** - * - */ - private static final long serialVersionUID = -5387857473125086791L; - - @Override - public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException - { - - - HttpServletRequest request = null; - if (req instanceof HttpServletRequest) - request = (HttpServletRequest)req; - else - throw new ServletException("Request not HttpServletRequest"); - - String servletPath=null; - String pathInfo=null; - if (request.getAttribute("javax.servlet.include.request_uri")!=null) - { - servletPath=(String)request.getAttribute("javax.servlet.include.servlet_path"); - pathInfo=(String)request.getAttribute("javax.servlet.include.path_info"); - if (servletPath==null) - { - servletPath=request.getServletPath(); - pathInfo=request.getPathInfo(); - } - } - else - { - servletPath = request.getServletPath(); - pathInfo = request.getPathInfo(); - } - - String pathInContext = URIUtil.addPaths(servletPath,pathInfo); - String jspFile = getInitParameter("jspFile"); - - //if the request is for a jsp file then fall through to the jsp servlet - if (jspFile == null) - { - if (pathInContext.endsWith("/")) - { - //dispatch via forward to the default servlet - getServletContext().getNamedDispatcher("default").forward(req, resp); - return; - } - else - { - //check if it resolves to a directory - Resource resource = ((ContextHandler.Context)getServletContext()).getContextHandler().getResource(pathInContext); - if (resource!=null && resource.isDirectory()) - { - //dispatch via forward to the default servlet - getServletContext().getNamedDispatcher("default").forward(req, resp); - return; - } - } - } - - //fall through to the normal jsp servlet handling - super.service(req, resp); - } - - -} diff --git a/jetty-jsp/src/main/resources/readme.txt b/jetty-jsp/src/main/resources/readme.txt deleted file mode 100644 index 39d448b46e8..00000000000 --- a/jetty-jsp/src/main/resources/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -This jar file is purely to work around a problem with the Maven Dependency plugin. -Several modules in jetty use the Dependency plugin to copy or unpack the dependencies of other modules. -However, the Dependency plugin is not capable of unpacking or copying a dependency of type 'pom', which -this module is, as it consists purely of external dependencies needed to run jsp. diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 1f8609d2597..7a137795018 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -42,28 +42,7 @@ apache-jsp ${project.version} - - org.eclipse.jetty.orbit - javax.servlet.jsp.jstl - - - org.glassfish.web - javax.servlet.jsp.jstl - - - org.mortbay.jasper - apache-el - 8.0.9.M3 - - diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index f056f298414..f9973464a03 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -164,12 +164,44 @@ - org.mortbay.jasper - apache-el - 8.0.9.M3 - test + org.glassfish.web + javax.servlet.jsp.jstl + 1.2.2 + + + javax.servlet.jsp.jstl + jstl-api + + + javax.servlet + servlet-api + + + javax.servlet.jsp + jsp-api + + + javax.el + el-api + + + + org.eclipse.jetty.orbit + javax.servlet.jsp.jstl + 1.2.0.v201105211821 + + + org.eclipse.jetty.orbit + javax.servlet + + + org.eclipse.jetty.orbit + javax.servlet.jsp + + + diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index a64b6ebf845..165a617b393 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -95,7 +95,12 @@ org.eclipse.jetty - jetty-jsp + apache-jsp + ${project.version} + + + org.eclipse.jetty + apache-jstl ${project.version} diff --git a/pom.xml b/pom.xml index 197d5775730..193d3b4c002 100644 --- a/pom.xml +++ b/pom.xml @@ -466,7 +466,6 @@ jetty-websocket jetty-servlets jetty-util-ajax - jetty-jsp apache-jsp apache-jstl jetty-maven-plugin @@ -540,37 +539,6 @@ 3.1.M0 - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - - org.glassfish.web - javax.servlet.jsp - 2.3.2 - - - - org.eclipse.jetty.toolchain - jetty-jsp-jdt - 2.3.3 - - - - - javax.el - javax.el-api - 3.0.0 - - - - org.glassfish - javax.el - 3.0.0 - - org.mortbay.jasper apache-jsp @@ -590,30 +558,6 @@ - - org.glassfish.web - javax.servlet.jsp.jstl - 1.2.2 - - - javax.servlet.jsp.jstl - jstl-api - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - javax.el - el-api - - - - org.apache.taglibs taglibs-standard-impl @@ -621,22 +565,6 @@ - - org.eclipse.jetty.orbit - javax.servlet.jsp.jstl - 1.2.0.v201105211821 - - - org.eclipse.jetty.orbit - javax.servlet - - - org.eclipse.jetty.orbit - javax.servlet.jsp - - - - org.apache.taglibs taglibs-standard-spec diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index ada8906a1d6..ba6bca2426c 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -132,7 +132,7 @@ org.eclipse.jetty - jetty-jsp + apache-jsp ${project.version}