tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime JspServlet.java
Date Fri, 15 Oct 1999 00:11:59 GMT
akv         99/10/14 17:11:58

  Modified:    src/share/org/apache/jasper/runtime JspServlet.java
  Log:
  Process the classpath init parameter.
  
  Revision  Changes    Path
  1.2       +27 -11    jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java
  
  Index: JspServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JspServlet.java	1999/10/09 00:20:40	1.1
  +++ JspServlet.java	1999/10/15 00:11:56	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v
1.1 1999/10/09 00:20:40 duncan Exp $
  - * $Revision: 1.1 $
  - * $Date: 1999/10/09 00:20:40 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v
1.2 1999/10/15 00:11:56 akv Exp $
  + * $Revision: 1.2 $
  + * $Date: 1999/10/15 00:11:56 $
    *
    * ====================================================================
    * 
  @@ -83,12 +83,8 @@
   import org.apache.jasper.Options;
   
   
  -
  -
  -
  -
   /**
  - * The JSP engine! 
  + * The JSP engine (a.k.a Jasper)! 
    *
    * @author Anil K. Vijendran
    * @author Harish Prabandham
  @@ -123,9 +119,29 @@
   	private void loadIfNecessary() 
               throws JasperException, ServletException, FileNotFoundException 
           {
  -	    if (loader.loadJSP(jspUri, engine.getClassPath(context),isErrorPage) || 
  -	                      (theServlet == null))
  -		load();
  +            // 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 is";
  +                cp = options.getClassPath();
  +            } else 
  +                accordingto = "according to the Servlet Engine is";
  +            
  +            
  +            Constants.message("jsp.message.cp_is", 
  +                              new Object[] { accordingto, cp }, 
  +                              Constants.MED_VERBOSITY);
  +
  +	    if (loader.loadJSP(jspUri, cp, isErrorPage) || theServlet == null) {
  +                load();
  +            }
   	}
   	
   	public void service(HttpServletRequest request, 
  
  
  

Mime
View raw message