costin 01/06/16 15:06:28
Modified: jasper34/generator/org/apache/jasper34/javagen
JavaSourceGenerator.java
jasper34/liaison/org/apache/jasper34/tomcat33
JspInterceptor.java
Log:
Fewer messages in JspInterceptor.
Started to add the mappings in JSG, to enable compiler error mapping to
jsp lines.
Revision Changes Path
1.4 +4 -1
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/javagen/JavaSourceGenerator.java
Index: JavaSourceGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/javagen/JavaSourceGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaSourceGenerator.java 2001/06/12 15:20:47 1.3
+++ JavaSourceGenerator.java 2001/06/16 22:06:27 1.4
@@ -84,7 +84,10 @@
// The sink writer:
private PrintWriter writer;
-
+
+ private Vector sourceFiles=new Vector();
+ private int lineMappings[][];
+
public JavaSourceGenerator(PrintWriter writer) {
this.writer = writer;
}
1.9 +6 -3
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JspInterceptor.java 2001/06/16 20:54:15 1.8
+++ JspInterceptor.java 2001/06/16 22:06:28 1.9
@@ -671,9 +671,10 @@
try {
javaC=compiler.createJavaCompiler(pageInfo,
JspInterceptor.JIKES);
+ log( "Created " + javaC );
compiler.prepareCompiler( javaC, pageInfo );
status = javaC.compile( javaFile );
-
+ log( "Compiled " + status + " " + javaC.getCompilerMessage() );
// remove java file if !keepgenerated, etc
compiler.postCompile(pageInfo);
@@ -729,7 +730,8 @@
File depFile=new File(getJspFilePath(ctx.getAbsolutePath(),
pageInfo));
dep.setOrigin( depFile );
- System.out.println("XXX " + depFile + " " + depFile.lastModified());
+ if(debug>0 )
+ log("Create dependency " + depFile + " " + depFile.lastModified());
dep.setTarget( handler );
//dep.setLocal( true );
File f=new File( pageInfo.getMangler().getClassFileName() );
@@ -737,7 +739,8 @@
// it has a previous version
dep.setLastModified(f.lastModified());
// update the "expired" variable
- System.out.println("XXY " + f + " " + f.lastModified());
+ if(debug>0 )
+ log("SetLastModified " + f + " " + f.lastModified());
dep.checkExpiry();
} else {
dep.setLastModified( -1 );