tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core Compiler.java ContainerLiaison.java
Date Thu, 07 Jun 2001 07:02:27 GMT
costin      01/06/07 00:02:27

  Modified:    jasper34 build.xml
               jasper34/generator/org/apache/jasper34/core Compiler.java
                        ContainerLiaison.java
  Log:
  Fix some mistakes in previous commit.
  
  Revision  Changes    Path
  1.5       +1 -0      jakarta-tomcat-jasper/jasper34/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper34/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	2001/06/06 06:48:17	1.4
  +++ build.xml	2001/06/07 07:02:22	1.5
  @@ -139,6 +139,7 @@
       <jar jarfile="${build.dir}/jasper34_liaison.jar" 
   	 basedir="${build.dir}/classes"> 
         <include name="org/apache/jasper34/servlet/**"/>    
  +      <include name="org/apache/jasper34/liaison/**"/>    
         <include name="org/apache/jasper34/tomcat33/**"/>    
       </jar>
   
  
  
  
  1.3       +5 -1      jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Compiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Compiler.java	2001/06/07 06:58:55	1.2
  +++ Compiler.java	2001/06/07 07:02:25	1.3
  @@ -100,12 +100,16 @@
           this.ctxt = ctxt;
   	this.liaison=liaison;
       }
  +    public Compiler(JspCompilationContext ctxt) {
  +        this.ctxt = ctxt;
  +	this.liaison=null;
  +    }
       
       /** 
        * Compile the jsp file from the current engine context
        *
        * @return true if the class file was outdated the jsp file
  -     *         was recompiled. 
  +     *         was recomp iled. 
        */
       public boolean compile()
           throws FileNotFoundException, JasperException, Exception 
  
  
  
  1.3       +8 -5      jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/ContainerLiaison.java
  
  Index: ContainerLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/ContainerLiaison.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContainerLiaison.java	2001/06/07 06:58:55	1.2
  +++ ContainerLiaison.java	2001/06/07 07:02:25	1.3
  @@ -63,6 +63,9 @@
   import org.apache.tomcat.util.log.Log;
   import org.apache.tomcat.util.res.StringManager;
   
  +import org.apache.jasper34.jsptree.*;
  +import java.io.IOException;
  +import org.apache.jasper34.runtime.JasperException;
   // XXX Not used yet - will replace part of Constants and JspCompilationCtx
   
   
  @@ -115,13 +118,13 @@
   	You can use the default implementation ( TagLibReader )
   	or container specific code.
       */
  -    public void readWebXml( TagLibraries tli )
  +    public abstract void readWebXml( TagLibraries tli )
   	throws IOException, JasperException;
   
       /** Read a tag lib descriptor ( tld ). You can use the default
   	implementation ( TagLibReader ).
       */
  -    public void readTLD( TagLibraries libs, TagLibraryInfoImpl tl,
  +    public abstract void readTLD( TagLibraries libs, TagLibraryInfoImpl tl,
   			 String prefix, String uri )
   	throws IOException, JasperException;
   
  @@ -131,13 +134,13 @@
       /**
        * The classpath that is passed off to the Java compiler. 
        */
  -    public String getClassPath();
  +    public abstract String getClassPath();
   
       /**
        * What class loader to use for loading classes while compiling
        * this JSP? I don't think this is used right now -- akv. 
        */
  -    public ClassLoader getClassLoader();
  +    public abstract  ClassLoader getClassLoader();
   
       // -------------------- Locations --------------------
   
  @@ -146,7 +149,7 @@
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  -    public String getOutputDir();
  +    public abstract String getOutputDir();
   
   
       
  
  
  

Mime
View raw message