Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

459681 Remove dead code after removal of glassfish jasper support

This commit is contained in:
Jan Bartel 2015-02-19 10:49:14 +11:00
parent adaa520cc9
commit b494fc36c5
2 changed files with 11 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/JSTLBundleDiscoverer.java
View File

@ -19,19 +19,13 @@
package org.eclipse.jetty.osgi.boot.jasper; package org.eclipse.jetty.osgi.boot.jasper;
import java.io.File; import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.servlet.Servlet;
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.JspFactory; import javax.servlet.jsp.JspFactory;
import org.apache.jasper.Constants;
import org.apache.jasper.compiler.Localizer;
import org.eclipse.jetty.deploy.DeploymentManager; import org.eclipse.jetty.deploy.DeploymentManager;
import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator; import org.eclipse.jetty.osgi.boot.JettyBootstrapActivator;
import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper; import org.eclipse.jetty.osgi.boot.utils.BundleFileLocatorHelper;
@ -40,9 +34,6 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil; import org.osgi.framework.FrameworkUtil;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/** /**
* *
@ -68,17 +59,7 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
*/ */
private static String DEFAULT_JSTL_BUNDLE_CLASS = "org.apache.taglibs.standard.tag.el.core.WhenTag"; private static String DEFAULT_JSTL_BUNDLE_CLASS = "org.apache.taglibs.standard.tag.el.core.WhenTag";
// used to be "org.apache.jasper.runtime.JspFactoryImpl" but now
// the standard tag library implementation are stored in a separate bundle.
// DISABLED please use the tld bundle argument for the OSGiAppProvider
// /**
// * Default name of a class that belongs to the bundle where the Java
// server Faces tld files are defined.
// * This is the sun's reference implementation.
// */
// private static String DEFAUT_JSF_IMPL_CLASS =
// "com.sun.faces.config.ConfigureListener";
/** /**
* Default jsp factory implementation. Idally jasper is osgified and we can * Default jsp factory implementation. Idally jasper is osgified and we can
@ -91,8 +72,6 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
public JSTLBundleDiscoverer() public JSTLBundleDiscoverer()
{ {
//fixupDtdResolution();
try try
{ {
// sanity check: // sanity check:
@ -168,8 +147,6 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
Bundle tldBundle = FrameworkUtil.getBundle(jstlClass); Bundle tldBundle = FrameworkUtil.getBundle(jstlClass);
File tldBundleLocation = locatorHelper.getBundleInstallLocation(tldBundle); File tldBundleLocation = locatorHelper.getBundleInstallLocation(tldBundle);
System.err.println("jstl bundle: "+tldBundle);
System.err.println("jstl bundle location: "+tldBundleLocation);
if (tldBundleLocation != null && tldBundleLocation.isDirectory()) if (tldBundleLocation != null && tldBundleLocation.isDirectory())
{ {
// try to find the jar files inside this folder // try to find the jar files inside this folder
@ -177,7 +154,6 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
{ {
if (f.getName().endsWith(".jar") && f.isFile()) if (f.getName().endsWith(".jar") && f.isFile())
{ {
System.err.println("Tld jar in dir: "+f.toURI());
urls.add(f.toURI().toURL()); urls.add(f.toURI().toURL());
} }
else if (f.isDirectory() && f.getName().equals("lib")) else if (f.isDirectory() && f.getName().equals("lib"))
@ -186,7 +162,6 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
{ {
if (f2.getName().endsWith(".jar") && f2.isFile()) if (f2.getName().endsWith(".jar") && f2.isFile())
{ {
System.err.println("Tld jar in lib dir: "+f2.toURI());
urls.add(f2.toURI().toURL()); urls.add(f2.toURI().toURL());
} }
} }
@ -196,7 +171,6 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
} }
else if (tldBundleLocation != null) else if (tldBundleLocation != null)
{ {
System.err.println("Tld bundle uri: "+tldBundleLocation.toURI());
urls.add(tldBundleLocation.toURI().toURL()); urls.add(tldBundleLocation.toURI().toURL());
String pattern = (String)deployer.getContextAttribute("org.eclipse.jetty.server.webapp.containerIncludeBundlePattern"); String pattern = (String)deployer.getContextAttribute("org.eclipse.jetty.server.webapp.containerIncludeBundlePattern");
@ -206,90 +180,10 @@ public class JSTLBundleDiscoverer implements TldBundleDiscoverer
pattern += "|"+tldBundle.getSymbolicName(); pattern += "|"+tldBundle.getSymbolicName();
deployer.setContextAttribute("org.eclipse.jetty.server.webapp.containerIncludeBundlePattern", pattern); deployer.setContextAttribute("org.eclipse.jetty.server.webapp.containerIncludeBundlePattern", pattern);
} }
System.err.println("PATTERN: "+pattern);
} }
} }
return urls.toArray(new URL[urls.size()]); return urls.toArray(new URL[urls.size()]);
} }
/**
* Jasper resolves the dtd when it parses a taglib descriptor. It uses this
* code to do that:
* ParserUtils.getClass().getResourceAsStream(resourcePath); where
* resourcePath is for example:
* /javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd Unfortunately, the
* dtd file is not in the exact same classloader as ParserUtils class and
* the dtds are packaged in 2 separate bundles. OSGi does not look in the
* dependencies' classloader when a resource is searched.
* <p>
* The workaround consists of setting the entity resolver. That is a patch
* added to the version of glassfish-jasper-jetty. IT is also present in the
* latest version of glassfish jasper. Could not use introspection to set
* new value on a static friendly field :(
* </p>
*/
void fixupDtdResolution()
{
try
{
// ParserUtils.setEntityResolver(new MyFixedupEntityResolver());
}
catch (Exception e)
{
e.printStackTrace();
}
}
/**
* Instead of using the ParserUtil's classloader, we use a class that is
* indeed next to the resource for sure.
*/
//static class MyFixedupEntityResolver implements EntityResolver
//{
/**
* Same values than in ParserUtils...
*/
/* static final String[] CACHED_DTD_PUBLIC_IDS = { Constants.TAGLIB_DTD_PUBLIC_ID_11, Constants.TAGLIB_DTD_PUBLIC_ID_12,
Constants.WEBAPP_DTD_PUBLIC_ID_22, Constants.WEBAPP_DTD_PUBLIC_ID_23, };
static final String[] CACHED_DTD_RESOURCE_PATHS = { Constants.TAGLIB_DTD_RESOURCE_PATH_11, Constants.TAGLIB_DTD_RESOURCE_PATH_12,
Constants.WEBAPP_DTD_RESOURCE_PATH_22, Constants.WEBAPP_DTD_RESOURCE_PATH_23, };
static final String[] CACHED_SCHEMA_RESOURCE_PATHS = { Constants.TAGLIB_SCHEMA_RESOURCE_PATH_20, Constants.TAGLIB_SCHEMA_RESOURCE_PATH_21,
Constants.WEBAPP_SCHEMA_RESOURCE_PATH_24, Constants.WEBAPP_SCHEMA_RESOURCE_PATH_25, };*/
/* public InputSource resolveEntity(String publicId, String systemId) throws SAXException
{
for (int i = 0; i < CACHED_DTD_PUBLIC_IDS.length; i++)
{
String cachedDtdPublicId = CACHED_DTD_PUBLIC_IDS[i];
if (cachedDtdPublicId.equals(publicId))
{
String resourcePath = CACHED_DTD_RESOURCE_PATHS[i];
InputStream input = null;
input = Servlet.class.getResourceAsStream(resourcePath);
if (input == null)
{
input = JspContext.class.getResourceAsStream(resourcePath);
if (input == null)
{*/
// if that failed try again with the original code:
// although it is likely not changed.
/* input = this.getClass().getResourceAsStream(resourcePath);
}
}
if (input == null) { throw new SAXException(Localizer.getMessage("jsp.error.internal.filenotfound", resourcePath)); }
InputSource isrc = new InputSource(input);
return isrc;
}
}
return null;
}
}*/
} }

41
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -91,11 +91,11 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
private transient boolean _enabled = true; private transient boolean _enabled = true;
private transient UnavailableException _unavailableEx; private transient UnavailableException _unavailableEx;
public static final String GLASSFISH_SENTINEL_CLASS = "org.glassfish.jsp.api.ResourceInjector";
public static final String APACHE_SENTINEL_CLASS = "org.apache.tomcat.InstanceManager"; public static final String APACHE_SENTINEL_CLASS = "org.apache.tomcat.InstanceManager";
public static final String JSP_GENERATED_PACKAGE_NAME = "org.eclipse.jetty.servlet.jspPackagePrefix"; public static final String JSP_GENERATED_PACKAGE_NAME = "org.eclipse.jetty.servlet.jspPackagePrefix";
public static final Map<String,String> NO_MAPPED_ROLES = Collections.emptyMap(); public static final Map<String,String> NO_MAPPED_ROLES = Collections.emptyMap();
public static enum JspContainer {GLASSFISH, APACHE, OTHER}; public static enum JspContainer {APACHE, OTHER};
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/** Constructor . /** Constructor .
@ -653,9 +653,6 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
/* Set the webapp's classpath for Jasper */ /* Set the webapp's classpath for Jasper */
ch.setAttribute("org.apache.catalina.jsp_classpath", ch.getClassPath()); ch.setAttribute("org.apache.catalina.jsp_classpath", ch.getClassPath());
/* Set the system classpath for Jasper */
setInitParameter("com.sun.appserv.jsp.classpath", Loader.getClassPath(ch.getClassLoader().getParent()));
/* Set up other classpath attribute */ /* Set up other classpath attribute */
if ("?".equals(getInitParameter("classpath"))) if ("?".equals(getInitParameter("classpath")))
{ {
@ -859,13 +856,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
private void adaptForcedPathToJspContainer (ServletRequest request) private void adaptForcedPathToJspContainer (ServletRequest request)
{ {
if (_forcedPath != null && _jspContainer != null && JspContainer.GLASSFISH.equals(_jspContainer)) //no-op for apache jsp
{
//if container is glassfish, set the request attribute org.apache.catalina.jsp_file to
//ensure the delegate jsp will be compiled
request.setAttribute("org.apache.catalina.jsp_file",_forcedPath);
}
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -873,29 +864,17 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
{ {
if (_jspContainer == null) if (_jspContainer == null)
{ {
//check for glassfish
try try
{ {
//if container is glassfish, set the request attribute org.apache.catalina.jsp_file to //check for apache
//ensure the delegate jsp will be compiled Loader.loadClass(Holder.class, APACHE_SENTINEL_CLASS);
Loader.loadClass(Holder.class, GLASSFISH_SENTINEL_CLASS); if (LOG.isDebugEnabled())LOG.debug("Apache jasper detected");
if (LOG.isDebugEnabled())LOG.debug("Glassfish jasper detected"); _jspContainer = JspContainer.APACHE;
_jspContainer = JspContainer.GLASSFISH;
} }
catch (ClassNotFoundException e) catch (ClassNotFoundException x)
{ {
try if (LOG.isDebugEnabled())LOG.debug("Other jasper detected");
{ _jspContainer = JspContainer.OTHER;
//check for apache
Loader.loadClass(Holder.class, APACHE_SENTINEL_CLASS);
if (LOG.isDebugEnabled())LOG.debug("Apache jasper detected");
_jspContainer = JspContainer.APACHE;
}
catch (ClassNotFoundException x)
{
if (LOG.isDebugEnabled())LOG.debug("Other jasper detected");
_jspContainer = JspContainer.OTHER;
}
} }
} }
} }