cvs commit: jakarta-tomcat/src/facade22/org/apache/tomcat/facade JspInterceptor.java

[costin]

costin      01/04/04 10:49:55

  Modified:    src/facade22/org/apache/tomcat/facade JspInterceptor.java
  Log:
  Fix for Jsp compilation of declared jsps, thanks to William Barker.
  
  Submitted by: William Barker <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.19      +4 -1      
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
  
  Index: JspInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JspInterceptor.java       2001/03/10 07:22:20     1.18
  +++ JspInterceptor.java       2001/04/04 17:49:55     1.19
  @@ -585,6 +585,7 @@
            try {
                Options options=new JasperOptionsImpl(args); 
                JspCompilationContext ctxt=createCompilationContext(req,
  +                                                                 jspFile,
                                                                    options,
                                                                    mangler);
                JavaCompiler javaC=createJavaCompiler( options );
  @@ -747,12 +748,14 @@
       }
   
       private JspCompilationContext createCompilationContext( Request req,
  +                                                         String jspFile,
                                                            Options opt,
                                                            Mangler mangler)
       {
        JasperEngineContext ctxt = new JasperEngineContext();
        ctxt.setServletClassName( mangler.getClassName());
  -     ctxt.setJspFile( req.servletPath().toString());
  +     //      ctxt.setJspFile( req.servletPath().toString());
  +     ctxt.setJspFile( jspFile );
        ctxt.setClassPath( computeClassPath( req.getContext()) );
   //        System.out.println("computeClasspath:"+ctxt.getClassPath());
        ctxt.setServletContext( req.getContext().getFacade());