cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator JspParseEventListener.java ServletWriter.java
costin 01/06/16 13:41:13
Modified:jasper34/generator/org/apache/jasper34/generator
JspParseEventListener.java ServletWriter.java
Log:
Adapt to the changed signature in JspPageInfo ( it was very confusing to
have different method names for the same thing - and the same info in 2 classes ).
Mangler is now used for all info related with the java/class file names.
Revision ChangesPath
1.7 +2 -1
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspParseEventListener.java2001/06/12 15:12:58 1.6
+++ JspParseEventListener.java2001/06/16 20:41:12 1.7
@@ -162,7 +162,8 @@
String uri = (String) attrs.get(uri);
String prefix = (String) attrs.get(prefix);
try {
- pageInfo.libraries.addTagLibrary( prefix, uri );
+ pageInfo.libraries.addTagLibrary( prefix, uri,
+ pageInfo.getJspFile() );
} catch (Exception ex) {
Object[] args = new Object[] { uri, ex.getMessage() };
throw new CompileException(start,
containerL.getString(jsp.error.badtaglib,
1.7 +6 -3
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java
Index: ServletWriter.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletWriter.java2001/06/12 15:13:00 1.6
+++ ServletWriter.java2001/06/16 20:41:12 1.7
@@ -120,8 +120,10 @@
private void generateHeader(JspPageInfo pageInfo)
throws JasperException
{
-String servletPackageName = pageInfo.getServletPackageName();
-String servletClassName = pageInfo.getServletClassName();
+String servletPackageName =
+ pageInfo.getMangler().getPackageName();
+String servletClassName =
+ pageInfo.getMangler().getClassName();
// First the package name:
this.setPackage( servletPackageName );
@@ -233,7 +235,8 @@
private void generateConstructor(JspPageInfo pageInfo )
throws JasperException
{
-this.println(public + pageInfo.getServletClassName()+( ) {);
+this.println(public +
+ pageInfo.getMangler().getClassName()+( ) {);
this.println(});
this.println();
}
cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator JspParseEventListener.java
costin 01/06/05 23:10:41
Modified:jasper34/generator/org/apache/jasper34/generator
JspParseEventListener.java
Log:
The simplified ParseEventListener.
It should be moved in parser, it is no longer involved in the code generation,
only in extracting the info from the JSP page using the parse events.
Revision ChangesPath
1.3 +105 -711
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspParseEventListener.java2001/05/28 02:19:30 1.2
+++ JspParseEventListener.java2001/06/06 06:10:40 1.3
@@ -76,623 +76,63 @@
import org.apache.jasper34.core.*;
-import org.apache.jasper34.core.*;
+import org.apache.jasper34.parser.*;
import org.apache.jasper34.runtime.JasperException;
import org.apache.tomcat.util.log.*;
+import org.apache.jasper34.jsptree.*;
/**
- * JSP code generator backend.
+ * JSP code generator backend. It will receive parse events and
+ * collect all informations about the page in a JspPageInfo object.
*
* @author Anil K. Vijendran
+ * @author Costin Manolache
*/
-public class JspParseEventListener extends BaseJspListener {
-
-private static CommentGenerator commentGenerator = new
JakartaCommentGenerator();
-
+public class JspParseEventListener implements ParseEventListener {
+
JspCompilationContext ctxt;
-
-String jspServletBase = Constants.JSP_SERVLET_BASE;
-String serviceMethodName = Constants.SERVICE_METHOD_NAME;
-String servletContentType = Constants.SERVLET_CONTENT_TYPE;
-
-String extendsClass = ;
-Vector interfaces = new Vector();
-Vector imports = new Vector();
-
-String error = ;
-
-boolean genSessionVariable = true;
-boolean singleThreaded = false;
-boolean autoFlush = true;
-
-Vector generators = new Vector();
-
-BeanRepository beanInfo;
-
-int bufferSize = Constants.DEFAULT_BUFFER_SIZE;
-// a set of boolean variables to check if there are multiple attr-val
-// pairs for jsp directive.
-boolean languageDir = false, extendsDir = false, sessionDir = false;
-boolean bufferDir = false, threadsafeDir = false, errorpageDir = false;
-boolean iserrorpageDir = false, infoDir = false, autoFlushDir = false;
-boolean contentTypeDir = false;
+protected JspReader reader;
+protected ServletWriter writer;
+JspPageInfo pageInfo;
+PageDirectives pageD=new PageDirectives();
-/* support for large files */
-int stringId = 0;
-Vector vector = new Vector();
-String dataFile;
-TagLibraries libraries;
-
-// Variables shared by all TagBeginGenerator and TagEndGenerator instances
-// to keep track of nested tags and variable names
-private Stack tagHandlerStack;
-private Hashtable tagVarNumbers;
-
-// This variable keeps track of tag pools. We only need
-// one tag pool per tag reuse scope.
-private Vector tagPools = new Vector();
-
-final void addGenerator(Generator gen) throws JasperException {
-gen.init(ctxt);
-generators.addElement(gen);
-}
-
-public static void setCommentGenerator(CommentGenerator generator) {
- if ( null == commentGenerator) {
- throw new IllegalArgumentException(null == generator);
- }
-
- commentGenerator = generator;
-}
-
/*
* Package private since I want everyone to come in through
* org.apache.jasper.compiler.Main.
*/
-JspParseEventListener(JspCompilationContext ctxt) {
- super(ctxt.getReader(), ctxt.getWriter());
+public JspParseEventListener(JspCompilationContext ctxt) {
+ reader=ctxt.getReader();
+ writer=ctxt.getWriter();
+ pageInfo=new JspPageInfo(ctxt);
this.ctxt = ctxt;
- this.beanInfo = new BeanRepository(ctxt.getClassLoader());
-this.libraries = new TagLibraries(ctxt.getClassLoader());
+}
-// FIXME: Is this good enough? (I'm just taking the easy way out - akv)
-if (ctxt.getOptions().getLargeFile())
-dataFile = ctxt.getOutputDir() + File.separatorChar +
-ctxt.getServletPackageName() + _ +
-ctxt.getServletClassName() + .dat;
+public void setTemplateInfo(Mark start, Mark stop) {
}
+
public void beginPageProcessing() throws JasperException {
+ // XXX not needed, standard imports should be part of JspPageInfo
for(int i = 0; i
cvs commit: jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator JspParseEventListener.java
costin 01/05/27 19:19:31
Modified:jasper34/generator/org/apache/jasper34/core Constants.java
jasper34/generator/org/apache/jasper34/generator
JspParseEventListener.java
Log:
Fix to generate code for the right runtime.
Revision ChangesPath
1.2 +1 -1
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/core/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java2001/05/27 23:23:16 1.1
+++ Constants.java2001/05/28 02:19:30 1.2
@@ -72,7 +72,7 @@
*/
public class Constants {
public static String JSP_RUNTIME_PACKAGE =
- org.apache.jasper.runtime;
+ org.apache.jasper34.runtime;
/**
* The base class of the generated servlets.
1.2 +2 -1
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java
Index: JspParseEventListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/JspParseEventListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspParseEventListener.java2001/05/27 23:19:31 1.1
+++ JspParseEventListener.java2001/05/28 02:19:30 1.2
@@ -276,7 +276,8 @@
writer.println(private boolean _jspx_inited = false;);
writer.println();
-writer.println(public final synchronized void _jspx_init() throws
JasperException {);
+writer.println(public final synchronized void _jspx_init() throws +
+Constants.JSP_RUNTIME_PACKAGE + .JasperException {);
writer.pushIndent();
writer.println(if (! _jspx_inited) {);
writer.pushIndent();
