Menu
▾
▴
[jboss-cvs] contrib/jetty/src/main/org/apache/jasper/servlet JspServletWrapper.java TomcatServletEngine.java ServletEngine.java JspServlet.java JasperLoader.java
|
From: Jules G. <jul...@us...> - 2002-08-24 18:53:53
|
User: jules_gosnell
Date: 02/08/24 11:53:51
Modified: jetty/src/main/org/apache/jasper/servlet Tag: Branch_3_2
TomcatServletEngine.java ServletEngine.java
JspServlet.java JasperLoader.java
Added: jetty/src/main/org/apache/jasper/servlet Tag: Branch_3_2
JspServletWrapper.java
Log:
bring us up to date with HEAD:
Jetty 4.1.0RC2
Jasper2
Latest distributable HttpSessions
Revision Changes Path
No revision
No revision
1.15.2.1 +3 -3 contrib/jetty/src/main/org/apache/jasper/servlet/TomcatServletEngine.java
Index: TomcatServletEngine.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/TomcatServletEngine.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- TomcatServletEngine.java 3 Aug 2002 02:02:49 -0000 1.15
+++ TomcatServletEngine.java 24 Aug 2002 18:53:51 -0000 1.15.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/TomcatServletEngine.java,v 1.15 2002/08/03 02:02:49 jules_gosnell Exp $
- * $Revision: 1.15 $
- * $Date: 2002/08/03 02:02:49 $
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/TomcatServletEngine.java,v 1.15.2.1 2002/08/24 18:53:51 jules_gosnell Exp $
+ * $Revision: 1.15.2.1 $
+ * $Date: 2002/08/24 18:53:51 $
*
* ====================================================================
*
1.15.2.1 +3 -3 contrib/jetty/src/main/org/apache/jasper/servlet/ServletEngine.java
Index: ServletEngine.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/ServletEngine.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- ServletEngine.java 3 Aug 2002 02:02:49 -0000 1.15
+++ ServletEngine.java 24 Aug 2002 18:53:51 -0000 1.15.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/ServletEngine.java,v 1.15 2002/08/03 02:02:49 jules_gosnell Exp $
- * $Revision: 1.15 $
- * $Date: 2002/08/03 02:02:49 $
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/ServletEngine.java,v 1.15.2.1 2002/08/24 18:53:51 jules_gosnell Exp $
+ * $Revision: 1.15.2.1 $
+ * $Date: 2002/08/24 18:53:51 $
*
* ====================================================================
*
1.3.2.1 +90 -470 contrib/jetty/src/main/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JspServlet.java 29 Apr 2002 15:18:01 -0000 1.3
+++ JspServlet.java 24 Aug 2002 18:53:51 -0000 1.3.2.1
@@ -1,4 +1,8 @@
/*
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JspServlet.java,v 1.3.2.1 2002/08/24 18:53:51 jules_gosnell Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2002/08/24 18:53:51 $
+ *
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
@@ -59,41 +63,23 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.SingleThreadModel;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.HttpJspPage;
-import javax.servlet.jsp.JspFactory;
-import java.util.Hashtable;
-import java.util.Enumeration;
-import java.io.File;
-import java.io.PrintWriter;
import java.io.IOException;
import java.io.FileNotFoundException;
-import java.io.FilePermission;
-import java.lang.RuntimePermission;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.MalformedURLException;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.PermissionCollection;
-import java.security.Policy;
-import java.security.PrivilegedAction;
+import java.util.Enumeration;
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.Options;
import org.apache.jasper.EmbededServletOptions;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.JspEngineContext;
-import org.apache.jasper.compiler.Mangler;
-import org.apache.jasper.runtime.*;
-import org.apache.jasper.compiler.Compiler;
-import org.apache.jasper.compiler.TldLocationsCache;
+import org.apache.jasper.compiler.JspRuntimeContext;
import org.apache.jasper.logging.Logger;
import org.apache.jasper.logging.DefaultLogger;
@@ -111,274 +97,44 @@
*
* @author Anil K. Vijendran
* @author Harish Prabandham
+ * @author Remy Maucherat
+ * @author Kin-man Chung
+ * @author Glenn Nielsen
*/
public class JspServlet extends HttpServlet {
- Logger.Helper loghelper;
-
- class JspServletWrapper {
- Servlet theServlet;
- String jspUri;
- boolean isErrorPage;
- // ServletWrapper will set this
- Class servletClass;
- URLClassLoader loader = null;
-
- JspServletWrapper(String jspUri, boolean isErrorPage) {
- this.jspUri = jspUri;
- this.isErrorPage = isErrorPage;
- this.theServlet = null;
- }
-
- private void load() throws JasperException, ServletException {
- try {
- // This is to maintain the original protocol.
- destroy();
-
- theServlet = (Servlet) servletClass.newInstance();
- } catch (Exception ex) {
- throw new JasperException(ex);
- }
- theServlet.init(JspServlet.this.config);
-/* Shouldn't be needed after switching to URLClassLoader
- if (theServlet instanceof HttpJspBase) {
- HttpJspBase h = (HttpJspBase) theServlet;
- h.setClassLoader(JspServlet.this.parentClassLoader);
- }
-*/
- }
-
- private void loadIfNecessary(HttpServletRequest req, HttpServletResponse res)
- throws JasperException, ServletException, FileNotFoundException
- {
- // First try context attribute; if that fails then use the
- // classpath init parameter.
-
- // Should I try to concatenate them if both are non-null?
-
- String cp = (String) context.getAttribute(Constants.SERVLET_CLASSPATH);
-
- String accordingto;
-
- if (cp == null || cp.equals("")) {
- accordingto = "according to the init parameter";
- cp = options.getClassPath();
- } else
- accordingto = "according to the Servlet Engine";
-
- Constants.message("jsp.message.cp_is",
- new Object[] {
- accordingto,
- cp == null ? "" : cp
- },
- Logger.INFORMATION);
-
- if (loadJSP(jspUri, cp, isErrorPage, req, res)
- || theServlet == null) {
- load();
- }
- }
-
- public void service(HttpServletRequest request,
- HttpServletResponse response,
- boolean precompile)
- throws ServletException, IOException, FileNotFoundException
- {
- try {
- loadIfNecessary(request, response);
-
- // If a page is to only to be precompiled return.
- if (precompile)
- return;
-
- if (theServlet instanceof SingleThreadModel) {
- // sync on the wrapper so that the freshness
- // of the page is determined right before servicing
- synchronized (this) {
- theServlet.service(request, response);
- }
- } else {
- theServlet.service(request, response);
- }
-
- } catch (FileNotFoundException ex) {
- String includeRequestUri = (String)
- request.getAttribute("javax.servlet.include.request_uri");
- if (includeRequestUri != null) {
- // This file was included. Throw an exception as
- // a response.sendError() will be ignored by the
- // servlet engine.
- throw new ServletException(ex);
- } else {
- try {
- response.sendError(HttpServletResponse.SC_NOT_FOUND,
- ex.getMessage());
- } catch (IllegalStateException ise) {
- Constants.jasperLog.log(Constants.getString
- ("jsp.error.file.not.found",
- new Object[] {
- ex.getMessage()
- }), ex,
- Logger.ERROR);
- }
- return;
- }
- }
- }
-
- public void destroy() {
- if (theServlet != null)
- theServlet.destroy();
- }
- }
-
-
- protected ServletContext context = null;
- protected Hashtable jsps = new Hashtable();
- protected ServletConfig config;
- protected Options options;
- protected URLClassLoader parentClassLoader;
- protected ServletEngine engine;
- protected String serverInfo;
- private PermissionCollection permissionCollection = null;
- private CodeSource codeSource = null;
+ private Logger.Helper loghelper;
- static boolean firstTime = true;
+ private ServletContext context;
+ private ServletConfig config;
+ private Options options;
+ private JspRuntimeContext rctxt;
public void init(ServletConfig config)
- throws ServletException
- {
+ throws ServletException {
+
super.init(config);
this.config = config;
this.context = config.getServletContext();
- this.serverInfo = context.getServerInfo();
// Setup logging
- // Constants.jasperLog = new JasperLogger(this.context);
Constants.jasperLog = new DefaultLogger(this.context);
Constants.jasperLog.setName("JASPER_LOG");
Constants.jasperLog.setTimestamp("false");
Constants.jasperLog.setVerbosityLevel(
- config.getInitParameter("logVerbosityLevel"));
- loghelper = new Logger.Helper("JASPER_LOG", "JspServlet");
+ config.getInitParameter("logVerbosityLevel"));
+ loghelper = new Logger.Helper("JASPER_LOG", "JspServlet");
- options = new EmbededServletOptions(config, context);
+ options = new EmbededServletOptions(config, context);
- // Get the parent class loader
- parentClassLoader =
- (URLClassLoader) Thread.currentThread().getContextClassLoader();
- if (parentClassLoader == null)
- parentClassLoader = (URLClassLoader)this.getClass().getClassLoader();
- if (parentClassLoader != null) {
- Constants.message("jsp.message.parent_class_loader_is",
- new Object[] {
- parentClassLoader.toString()
- }, Logger.DEBUG);
- }
- else {
- Constants.message("jsp.message.parent_class_loader_is",
- new Object[] {
- "<none>"
- }, Logger.DEBUG);
- }
+ // Initialize the JSP Runtime Context
+ rctxt = new JspRuntimeContext(context,options);
- // Setup the PermissionCollection for this web app context
- // based on the permissions configured for the root of the
- // web app context directory, then add a file read permission
- // for that directory.
- Policy policy = Policy.getPolicy();
- if( policy != null ) {
- try {
- // Get the permissions for the web app context
- String contextDir = context.getRealPath("/");
- if( contextDir == null )
- contextDir = options.getScratchDir().toString();
- URL url = new URL("file:" + contextDir);
- codeSource = new CodeSource(url,null);
- permissionCollection = policy.getPermissions(codeSource);
- // Create a file read permission for web app context directory
- if (contextDir.endsWith(File.separator))
- contextDir = contextDir + "-";
- else
- contextDir = contextDir + File.separator + "-";
- permissionCollection.add( new FilePermission(contextDir,"read") );
- // Allow the JSP to access org.apache.jasper.runtime.HttpJspBase
- permissionCollection.add( new RuntimePermission(
- "accessClassInPackage.org.apache.jasper.runtime") );
- if (parentClassLoader instanceof URLClassLoader) {
- URL [] urls = parentClassLoader.getURLs();
- String jarUrl = null;
- String jndiUrl = null;
- for (int i=0; i<urls.length; i++) {
- if (jndiUrl == null && urls[i].toString().startsWith("jndi:") ) {
- jndiUrl = urls[i].toString() + "-";
- }
- if (jarUrl == null && urls[i].toString().startsWith("jar:jndi:") ) {
- jarUrl = urls[i].toString();
- jarUrl = jarUrl.substring(0,jarUrl.length() - 2);
- jarUrl = jarUrl.substring(0,jarUrl.lastIndexOf('/')) + "/-";
- }
- }
- if (jarUrl != null) {
- permissionCollection.add( new FilePermission(jarUrl,"read") );
- permissionCollection.add( new FilePermission(jarUrl.substring(4),"read") );
- }
- if (jndiUrl != null)
- permissionCollection.add( new FilePermission(jndiUrl,"read") );
- }
- } catch(MalformedURLException mfe) {
- }
- }
-
- if (firstTime) {
- firstTime = false;
- if( System.getSecurityManager() != null ) {
- // Make sure classes needed at runtime by a JSP servlet
- // are already loaded by the class loader so that we
- // don't get a defineClassInPackage security exception.
- String basePackage = "org.apache.jasper.";
- try {
- parentClassLoader.loadClass( basePackage +
- "runtime.JspFactoryImpl$PrivilegedGetPageContext");
- parentClassLoader.loadClass( basePackage +
- "runtime.JspFactoryImpl$PrivilegedReleasePageContext");
- parentClassLoader.loadClass( basePackage +
- "runtime.JspRuntimeLibrary");
- parentClassLoader.loadClass( basePackage +
- "runtime.JspRuntimeLibrary$PrivilegedIntrospectHelper");
- parentClassLoader.loadClass( basePackage +
- "runtime.ServletResponseWrapperInclude");
- this.getClass().getClassLoader().loadClass( basePackage +
- "servlet.JspServlet$JspServletWrapper");
- } catch (ClassNotFoundException ex) {
- System.out.println(
- "Jasper JspServlet preload of class failed: " +
- ex.getMessage());
- }
- }
- Constants.message("jsp.message.scratch.dir.is",
- new Object[] {
- options.getScratchDir().toString()
- }, Logger.INFORMATION );
- Constants.message("jsp.message.dont.modify.servlets", Logger.INFORMATION);
- JspFactory.setDefaultFactory(new JspFactoryImpl());
- }
- }
-
- private void serviceJspFile(HttpServletRequest request,
- HttpServletResponse response, String jspUri,
- Throwable exception, boolean precompile)
- throws ServletException, IOException
- {
- boolean isErrorPage = exception != null;
-
- JspServletWrapper wrapper = (JspServletWrapper) jsps.get(jspUri);
- if (wrapper == null) {
- wrapper = new JspServletWrapper(jspUri, isErrorPage);
- jsps.put(jspUri, wrapper);
- }
-
- wrapper.service(request, response, precompile);
+ Constants.message("jsp.message.scratch.dir.is",
+ new Object[] { options.getScratchDir().toString() },
+ Logger.INFORMATION );
+ Constants.message("jsp.message.dont.modify.servlets",
+ Logger.INFORMATION);
}
@@ -395,79 +151,90 @@
* @exception ServletException if an invalid parameter value for the
* <code>jsp_precompile</code> parameter name is specified
*/
- boolean preCompile(HttpServletRequest request)
- throws ServletException
- {
+ boolean preCompile(HttpServletRequest request) throws ServletException {
String queryString = request.getQueryString();
- if (queryString == null)
+ if (queryString == null) {
return (false);
+ }
int start = queryString.indexOf(Constants.PRECOMPILE);
- if (start < 0)
+ if (start < 0) {
return (false);
+ }
queryString =
queryString.substring(start + Constants.PRECOMPILE.length());
- if (queryString.length() == 0)
+ if (queryString.length() == 0) {
return (true); // ?jsp_precompile
- if (queryString.startsWith("&"))
+ }
+ if (queryString.startsWith("&")) {
return (true); // ?jsp_precompile&foo=bar...
- if (!queryString.startsWith("="))
+ }
+ if (!queryString.startsWith("=")) {
return (false); // part of some other name or value
+ }
int limit = queryString.length();
int ampersand = queryString.indexOf("&");
- if (ampersand > 0)
+ if (ampersand > 0) {
limit = ampersand;
+ }
String value = queryString.substring(1, limit);
- if (value.equals("true"))
+ if (value.equals("true")) {
return (true); // ?jsp_precompile=true
- else if (value.equals("false"))
+ } else if (value.equals("false")) {
return (true); // ?jsp_precompile=false
- else
+ } else {
throw new ServletException("Cannot have request parameter " +
Constants.PRECOMPILE + " set to " +
value);
+ }
}
-
public void service (HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException
- {
+ throws ServletException, IOException {
+
try {
String includeUri
= (String) request.getAttribute(Constants.INC_SERVLET_PATH);
String jspUri;
- if (includeUri == null)
+ if (includeUri == null) {
jspUri = request.getServletPath();
- else
+ } else {
jspUri = includeUri;
+ }
String jspFile = (String) request.getAttribute(Constants.JSP_FILE);
- if (jspFile != null)
+ if (jspFile != null) {
jspUri = jspFile;
+ }
boolean precompile = preCompile(request);
Logger jasperLog = Constants.jasperLog;
- if (jasperLog != null &&
- jasperLog.matchVerbosityLevel(Logger.INFORMATION))
+ if (jasperLog != null
+ && jasperLog.matchVerbosityLevel(Logger.INFORMATION))
{
jasperLog.log("JspEngine --> "+jspUri);
- jasperLog.log("\t ServletPath: "+request.getServletPath());
- jasperLog.log("\t PathInfo: "+request.getPathInfo());
- jasperLog.log("\t RealPath: "
- +getServletConfig().getServletContext().getRealPath(jspUri));
- jasperLog.log("\t RequestURI: "+request.getRequestURI());
- jasperLog.log("\t QueryString: "+request.getQueryString());
+ jasperLog.log("\t ServletPath: " +
+ request.getServletPath());
+ jasperLog.log("\t PathInfo: " +
+ request.getPathInfo());
+ jasperLog.log("\t RealPath: " +
+ context.getRealPath(jspUri));
+ jasperLog.log("\t RequestURI: " +
+ request.getRequestURI());
+ jasperLog.log("\t QueryString: " +
+ request.getQueryString());
jasperLog.log("\t Request Params: ");
Enumeration e = request.getParameterNames();
while (e.hasMoreElements()) {
String name = (String) e.nextElement();
- jasperLog.log("\t\t "+name+" = "+request.getParameter(name));
+ jasperLog.log("\t\t " + name + " = " +
+ request.getParameter(name));
}
}
serviceJspFile(request, response, jspUri, null, precompile);
@@ -481,193 +248,46 @@
throw new ServletException(e);
}
- // It's better to throw the exception - we don't
- // know if we can deal with sendError ( buffer may be
- // commited )
- // catch (Throwable t) {
- // unknownException(response, t);
- // }
}
public void destroy() {
+
if (Constants.jasperLog != null)
Constants.jasperLog.log("JspServlet.destroy()", Logger.INFORMATION);
- Enumeration servlets = jsps.elements();
- while (servlets.hasMoreElements())
- ((JspServletWrapper) servlets.nextElement()).destroy();
+ rctxt.destroy();
}
- /* Check if we need to reload a JSP page.
- *
- * Side-effect: re-compile the JSP page.
- *
- * @param classpath explicitly set the JSP compilation path.
- * @return true if JSP files is newer
- */
- boolean loadJSP(String jspUri, String classpath,
- boolean isErrorPage, HttpServletRequest req, HttpServletResponse res)
- throws JasperException, FileNotFoundException
- {
- // First check if the requested JSP page exists, to avoid creating
- // unnecessary directories and files.
- if (context.getResourceAsStream(jspUri) == null)
- throw new FileNotFoundException(jspUri);
-
- JspServletWrapper jsw=(JspServletWrapper) jsps.get(jspUri);
- if( jsw==null ) {
- throw new JasperException("Can't happen - JspServletWrapper=null");
- }
- File outDir = null;
- try {
- URL outURL = options.getScratchDir().toURL();
- String outURI = outURL.toString();
- if( outURI.endsWith("/") )
- outURI = outURI + jspUri.substring(1,jspUri.lastIndexOf("/")+1);
- else
- outURI = outURI + jspUri.substring(0,jspUri.lastIndexOf("/")+1);;
- outURL = new URL(outURI);
- outDir = new File(outURL.getFile());
- if( !outDir.exists() ) {
- outDir.mkdirs();
- }
- } catch(Exception e) {
- throw new JasperException("No output directory: " + e.getMessage());
- }
- boolean firstTime = jsw.servletClass == null;
- JspCompilationContext ctxt = new JspEngineContext(parentClassLoader, classpath,
- context, jspUri, outDir.toString() + File.separator,
- isErrorPage, options,
- req, res);
- boolean outDated = false;
+ // -------------------------------------------------------- Private Methods
- Compiler compiler = ctxt.createCompiler();
-
- try {
- outDated = compiler.compile();
- if ( (jsw.servletClass == null) || (compiler.isOutDated()) ) {
- synchronized ( this ) {
- if ((jsw.servletClass == null) ||
- (compiler.isOutDated() )) {
- outDated = compiler.compile();
- }
- }
+ private void serviceJspFile(HttpServletRequest request,
+ HttpServletResponse response, String jspUri,
+ Throwable exception, boolean precompile)
+ throws ServletException, IOException {
+
+ JspServletWrapper wrapper =
+ (JspServletWrapper) rctxt.getWrapper(jspUri);
+ if (wrapper == null) {
+ // First check if the requested JSP page exists, to avoid
+ // creating unnecessary directories and files.
+ if (context.getResourceAsStream(jspUri) == null) {
+ response.sendError(HttpServletResponse.SC_NOT_FOUND, jspUri);
+ return;
+ }
+ boolean isErrorPage = exception != null;
+ synchronized(this) {
+ wrapper = (JspServletWrapper) rctxt.getWrapper(jspUri);
+ if (wrapper == null) {
+ wrapper = new JspServletWrapper(config, options, jspUri,
+ isErrorPage, rctxt);
+ rctxt.addWrapper(jspUri,wrapper);
+ }
}
- } catch (FileNotFoundException ex) {
- compiler.removeGeneratedFiles();
- throw ex;
- } catch (JasperException ex) {
- throw ex;
- } catch (Exception ex) {
- throw new JasperException(Constants.getString("jsp.error.unable.compile"),
- ex);
- }
-
- // Reload only if it's outdated
- if((jsw.servletClass == null) || outDated) {
- try {
- URL [] urls = new URL[1];
- File outputDir = new File(normalize(ctxt.getOutputDir()));
- urls[0] = outputDir.toURL();
- jsw.loader = new JasperLoader(urls,ctxt.getServletClassName(),
- parentClassLoader,
- permissionCollection,
- codeSource);
- jsw.servletClass = jsw.loader.loadClass(
- Constants.JSP_PACKAGE_NAME + "." + ctxt.getServletClassName());
- } catch (ClassNotFoundException cex) {
- throw new JasperException(
- Constants.getString("jsp.error.unable.load"),cex);
- } catch (MalformedURLException mue) {
- throw new JasperException(
- Constants.getString("jsp.error.unable.load"),mue);
- }
-
- }
-
- return outDated;
- }
-
-
- /**
- * Determines whether the current JSP class is older than the JSP file
- * from whence it came
- */
- public boolean isOutDated(File jsp, JspCompilationContext ctxt,
- Mangler mangler ) {
- File jspReal = null;
- boolean outDated;
-
- jspReal = new File(ctxt.getRealPath(jsp.getPath()));
-
- File classFile = new File(mangler.getClassFileName());
- if (classFile.exists()) {
- outDated = classFile.lastModified() < jspReal.lastModified();
- } else {
- outDated = true;
}
- return outDated;
- }
-
-
- /**
- * Return a context-relative path, beginning with a "/", that represents
- * the canonical version of the specified path after ".." and "." elements
- * are resolved out. If the specified path attempts to go outside the
- * boundaries of the current context (i.e. too many ".." path elements
- * are present), return <code>null</code> instead.
- *
- * @param path Path to be normalized
- */
- protected String normalize(String path) {
-
- if (path == null)
- return null;
-
- String normalized = path;
-
- // Normalize the slashes and add leading slash if necessary
- if (normalized.indexOf('\\') >= 0)
- normalized = normalized.replace('\\', '/');
- if (!normalized.startsWith("/"))
- normalized = "/" + normalized;
-
- // Resolve occurrences of "//" in the normalized path
- while (true) {
- int index = normalized.indexOf("//");
- if (index < 0)
- break;
- normalized = normalized.substring(0, index) +
- normalized.substring(index + 1);
- }
-
- // Resolve occurrences of "/./" in the normalized path
- while (true) {
- int index = normalized.indexOf("/./");
- if (index < 0)
- break;
- normalized = normalized.substring(0, index) +
- normalized.substring(index + 2);
- }
-
- // Resolve occurrences of "/../" in the normalized path
- while (true) {
- int index = normalized.indexOf("/../");
- if (index < 0)
- break;
- if (index == 0)
- return (null); // Trying to go outside our context
- int index2 = normalized.lastIndexOf('/', index - 1);
- normalized = normalized.substring(0, index2) +
- normalized.substring(index + 3);
- }
-
- // Return the normalized path that we have completed
- return (normalized);
+ wrapper.service(request, response, precompile);
}
-
}
1.1.4.1 +2 -3 contrib/jetty/src/main/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- JasperLoader.java 17 Jan 2002 01:23:17 -0000 1.1
+++ JasperLoader.java 24 Aug 2002 18:53:51 -0000 1.1.4.1
@@ -71,7 +71,6 @@
import org.apache.jasper.JasperException;
import org.apache.jasper.Constants;
import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.JspEngineContext;
import org.apache.jasper.Options;
import org.apache.jasper.compiler.Compiler;
@@ -106,7 +105,7 @@
private SecurityManager securityManager = null;
private PrivilegedLoadClass privLoadClass = null;
- JasperLoader(URL [] urls, String className, ClassLoader parent,
+ public JasperLoader(URL [] urls, String className, ClassLoader parent,
PermissionCollection permissionCollection,
CodeSource codeSource) {
super(urls,parent);
@@ -202,7 +201,7 @@
}
// Only load classes for this JSP page
- if( name.startsWith(Constants.JSP_PACKAGE_NAME + "." + className) ) {
+ if( name.startsWith(className) ) {
String classFile = name.substring(Constants.JSP_PACKAGE_NAME.length()+1) +
".class";
byte [] cdata = loadClassDataFromFile(classFile);
No revision
No revision
1.1.2.1 +2 -2 contrib/jetty/src/main/org/apache/jasper/servlet/JspServletWrapper.java
Index: JspServletWrapper.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JspServletWrapper.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- JspServletWrapper.java 22 Aug 2002 00:41:31 -0000 1.1
+++ JspServletWrapper.java 24 Aug 2002 18:53:51 -0000 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JspServletWrapper.java,v 1.1 2002/08/22 00:41:31 jules_gosnell Exp $
- * $Revision: 1.1 $
- * $Date: 2002/08/22 00:41:31 $
+ * $Header: /cvsroot/jboss/contrib/jetty/src/main/org/apache/jasper/servlet/JspServletWrapper.java,v 1.1.2.1 2002/08/24 18:53:51 jules_gosnell Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2002/08/24 18:53:51 $
*
* The Apache Software License, Version 1.1
*
|