costin 01/06/17 13:22:27
Modified: jasper34/generator/org/apache/jasper34/core Compiler.java
Constants.java
Log:
Logs, simpler creation of JavaCompiler.
Revision Changes Path
1.6 +10 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Compiler.java 2001/06/16 20:35:20 1.5
+++ Compiler.java 2001/06/17 20:22:26 1.6
@@ -207,7 +207,7 @@
{
Options options=pageInfo.getOptions();
if( debug > 0 ) logCompileInfo( pageInfo );
-
+
javac.setEncoding(pageInfo.getJavaEncoding());
javac.setClasspath( computeCompilerClassPath( pageInfo ) );
javac.setOutputDir(containerL.getOutputDir());
@@ -216,6 +216,8 @@
}
public void logCompileInfo( JspPageInfo pageInfo ) {
+ containerL.log( "Compiling java file " +
+ pageInfo.getMangler().getJavaFileName());
Options options=pageInfo.getOptions();
containerL.log( "CLASSPATH= " + computeCompilerClassPath( pageInfo) );
if( debug > 2) {
@@ -253,10 +255,7 @@
/** Create a compier based on our options
*/
public JavaCompiler createJavaCompiler(JspPageInfo pageInfo) {
- String javacName=pageInfo.getOptions().getJspCompilerPlugin();
- JavaCompiler javaC=JavaCompiler.createJavaCompiler( containerL,
- javacName );
- return javaC;
+ return createJavaCompiler( pageInfo, null );
}
/** Create a compier using a certain plugin
@@ -264,6 +263,9 @@
public JavaCompiler createJavaCompiler(JspPageInfo pageInfo,
String javacName)
{
+ if( javacName==null )
+ javacName=pageInfo.getOptions().getJspCompilerPlugin();
+
JavaCompiler javaC=JavaCompiler.createJavaCompiler( containerL,
javacName );
return javaC;
@@ -271,6 +273,9 @@
public void postCompile( JspPageInfo pageInfo ) {
+ if(debug>0) containerL.log( "Generated " +
+ pageInfo.getMangler().getClassFileName() );
+
if (!pageInfo.getOptions().getKeepGenerated()) {
File javaFile = new File(pageInfo.getMangler().getJavaFileName());
javaFile.delete();
1.6 +0 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Constants.java 2001/06/12 15:01:01 1.5
+++ Constants.java 2001/06/17 20:22:27 1.6
@@ -141,17 +141,10 @@
public static final int DEFAULT_BUFFER_SIZE = 8*K;
/**
- * The query parameter that causes the JSP engine to just
- * pregenerated the servlet but not invoke it.
- */
- public static final String PRECOMPILE = "jsp_precompile";
-
- /**
* Servlet context and request attributes that the JSP engine
* uses.
*/
public static final String INC_REQUEST_URI =
"javax.servlet.include.request_uri";
- public static final String INC_SERVLET_PATH =
"javax.servlet.include.servlet_path";
public static final String TMP_DIR = "javax.servlet.context.tempdir";
/**
