costin 01/06/05 23:40:51
Modified: jasper34/liaison/org/apache/jasper34/cli
CommandLineCompiler.java CommandLineContext.java
JspC.java
jasper34/liaison/org/apache/jasper34/servlet
JspCompiler.java JspEngineContext.java
JspServlet.java
jasper34/liaison/org/apache/jasper34/tomcat33
JasperEngineContext.java JspInterceptor.java
Log:
Import changes.
Revision Changes Path
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/CommandLineCompiler.java
Index: CommandLineCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/CommandLineCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandLineCompiler.java 2001/05/28 02:17:29 1.1
+++ CommandLineCompiler.java 2001/06/06 06:40:38 1.2
@@ -62,7 +62,7 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
/**
* Overrides some methods so that we get the desired effects.
1.2 +2 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/CommandLineContext.java
Index: CommandLineContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/CommandLineContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandLineContext.java 2001/05/28 02:17:29 1.1
+++ CommandLineContext.java 2001/06/06 06:40:40 1.2
@@ -60,9 +60,10 @@
import java.io.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.*;
+import org.apache.jasper34.parser.*;
//import org.apache.jasper.runtime.JspLoader;
// Use the jasper loader - the only function used is to add a jar
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/cli/JspC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspC.java 2001/05/28 02:17:29 1.1
+++ JspC.java 2001/06/06 06:40:40 1.2
@@ -61,7 +61,7 @@
import java.util.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.core.*;
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspCompiler.java
Index: JspCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspCompiler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspCompiler.java 2001/05/28 03:03:28 1.1
+++ JspCompiler.java 2001/06/06 06:40:45 1.2
@@ -60,7 +60,7 @@
import org.apache.jasper34.core.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.jasper34.runtime.JasperException;
import org.apache.tomcat.util.log.*;
1.3 +2 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspEngineContext.java
Index: JspEngineContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspEngineContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspEngineContext.java 2001/05/28 03:03:28 1.2
+++ JspEngineContext.java 2001/06/06 06:40:46 1.3
@@ -64,9 +64,10 @@
import java.io.IOException;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.*;
+import org.apache.jasper34.parser.*;
import org.apache.jasper34.javacompiler.*;
import org.apache.tomcat.util.log.*;
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspServlet.java
Index: JspServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/servlet/JspServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspServlet.java 2001/05/28 02:17:58 1.1
+++ JspServlet.java 2001/06/06 06:40:46 1.2
@@ -76,7 +76,7 @@
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.core.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.tomcat.util.log.Log;
1.2 +2 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JasperEngineContext.java
Index: JasperEngineContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JasperEngineContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperEngineContext.java 2001/05/28 02:18:58 1.1
+++ JasperEngineContext.java 2001/06/06 06:40:49 1.2
@@ -57,9 +57,10 @@
import javax.servlet.*;
import javax.servlet.http.*;
import org.apache.jasper34.generator.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.jasper34.core.*;
import org.apache.jasper34.runtime.*;
+import org.apache.jasper34.parser.*;
import java.util.*;
import java.io.*;
1.3 +1 -1
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspInterceptor.java 2001/05/28 03:03:29 1.2
+++ JspInterceptor.java 2001/06/06 06:40:50 1.3
@@ -73,7 +73,7 @@
import org.apache.jasper34.runtime.*;
import org.apache.jasper34.generator.*;
import org.apache.jasper34.javacompiler.*;
-import org.apache.jasper34.generator.Compiler;
+import org.apache.jasper34.core.Compiler;
import org.apache.tomcat.core.*;
import org.apache.tomcat.facade.*;
