glenn 01/02/08 05:38:38
Modified: jasper/src/share/org/apache/jasper/servlet JspServlet.java
Log:
Put runtime jsp page servlets in a package
Revision Changes Path
1.12 +8 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JspServlet.java 2001/02/07 01:38:27 1.11
+++ JspServlet.java 2001/02/08 13:38:38 1.12
@@ -240,6 +240,7 @@
protected ServletEngine engine;
protected String serverInfo;
private PermissionCollection permissionCollection = null;
+ private CodeSource codeSource = null;
static boolean firstTime = true;
@@ -288,8 +289,8 @@
try {
// Get the permissions for the web app context
URL url = options.getScratchDir().toURL();
- CodeSource cs = new CodeSource(url,null);
- permissionCollection = policy.getPermissions(cs);
+ codeSource = new CodeSource(url,null);
+ permissionCollection = policy.getPermissions(codeSource);
// Create a file read permission for web app context directory
String contextDir = url.getFile();
if( contextDir.endsWith(File.separator) )
@@ -520,8 +521,11 @@
File outputDir = new File(normalize(ctxt.getOutputDir()));
urls[0] = outputDir.toURL();
jsw.loader = new JasperLoader(urls,ctxt.getServletClassName(),
- parentClassLoader,permissionCollection);
- jsw.servletClass = jsw.loader.loadClass(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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
