You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/08/18 22:58:52 UTC

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper Constants.java

pierred     00/08/18 13:58:52

  Modified:    jasper/src/share/org/apache/jasper Constants.java
  Log:
  Use proper 'catalina' (not tomcat) classes for SERVLET_CLASSPATH and
  SERVLET_CLASSLOADER.
  
  jasper now passes the watchdog tests, except for a few exceptions
  (which I'll be looking at right away).
  
  Revision  Changes    Path
  1.2       +7 -3      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java	2000/08/12 00:52:05	1.1
  +++ Constants.java	2000/08/18 20:58:51	1.2
  @@ -103,20 +103,23 @@
       };
   
       /**
  +     * FIXME
        * ServletContext attribute for classpath. This is tomcat specific. 
        * Other servlet engines can choose to have this attribute if they 
        * want to have this JSP engine running on them. 
        */
  -    public static final String SERVLET_CLASSPATH = "org.apache.tomcat.jsp_classpath";
  +    //public static final String SERVLET_CLASSPATH = "org.apache.tomcat.jsp_classpath";
  +    public static final String SERVLET_CLASSPATH = "org.apache.catalina.jsp_classpath";
   
       /**
  +     * FIXME
        * ServletContext attribute for classpath. This is tomcat specific. 
        * Other servlet engines can choose to have this attribute if they 
        * want to have this JSP engine running on them. 
        */
  -    public static final String SERVLET_CLASS_LOADER = "org.apache.tomcat.classloader";
  +    //public static final String SERVLET_CLASS_LOADER = "org.apache.tomcat.classloader";
  +    public static final String SERVLET_CLASS_LOADER = "org.apache.catalina.classloader";
   
  -
       /**
        * Default size of the JSP buffer.
        */
  @@ -138,6 +141,7 @@
       public static final String TMP_DIR = "javax.servlet.context.tempdir";
   
       /**
  +     * FIXME
        * ProtectionDomain to use for JspLoader defineClass() for current
        * Context when using a SecurityManager.
        */