cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java
luehe 2004/10/05 12:06:31 Modified:jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java Log: Determine t1 only as needed Revision ChangesPath 1.6 +7 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java Index: AntCompiler.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- AntCompiler.java 4 Oct 2004 20:57:51 - 1.5 +++ AntCompiler.java 5 Oct 2004 19:06:31 - 1.6 @@ -105,7 +105,11 @@ protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { -long t1=System.currentTimeMillis(); +long t1 = 0; +if (log.isDebugEnabled()) { +t1 = System.currentTimeMillis(); +} + String javaEncoding = ctxt.getOptions().getJavaEncoding(); String javaFileName = ctxt.getServletJavaFileName(); String classpath = ctxt.getClassPath(); @@ -242,7 +246,8 @@ if( log.isDebugEnabled() ) { long t2=System.currentTimeMillis(); -log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) + "ms"); +log.debug("Compiled " + ctxt.getServletJavaFileName() + " " + + (t2-t1) + "ms"); } logger = null; 1.7 +6 -2 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java Index: JDTCompiler.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JDTCompiler.java 4 Oct 2004 20:57:51 - 1.6 +++ JDTCompiler.java 5 Oct 2004 19:06:31 - 1.7 @@ -80,7 +80,10 @@ protected void generateClass(String[] smap) throws FileNotFoundException, JasperException, Exception { -long t1=System.currentTimeMillis(); +long t1 = 0; +if (log.isDebugEnabled()) { +t1 = System.currentTimeMillis(); +} final String sourceFile = ctxt.getServletJavaFileName(); final String outputDir = ctxt.getOptions().getScratchDir().getAbsolutePath(); @@ -388,7 +391,8 @@ if( log.isDebugEnabled() ) { long t2=System.currentTimeMillis(); -log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) + "ms"); +log.debug("Compiled " + ctxt.getServletJavaFileName() + " " + + (t2-t1) + "ms"); } if (ctxt.isPrototypeMode()) { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java
luehe 2004/10/04 13:57:51 Modified:jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java Log: Don't calculate t2 unless needed Revision ChangesPath 1.5 +1 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java Index: AntCompiler.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AntCompiler.java 21 Sep 2004 19:36:12 - 1.4 +++ AntCompiler.java 4 Oct 2004 20:57:51 - 1.5 @@ -240,8 +240,8 @@ } } -long t2=System.currentTimeMillis(); if( log.isDebugEnabled() ) { +long t2=System.currentTimeMillis(); log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) + "ms"); } 1.6 +1 -1 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java Index: JDTCompiler.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JDTCompiler.java 4 Oct 2004 19:42:33 - 1.5 +++ JDTCompiler.java 4 Oct 2004 20:57:51 - 1.6 @@ -386,8 +386,8 @@ errDispatcher.javacError(jeds); } -long t2=System.currentTimeMillis(); if( log.isDebugEnabled() ) { +long t2=System.currentTimeMillis(); log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) + "ms"); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java
yoavs 2004/09/02 09:05:07 Modified:jasper2/src/share/org/apache/jasper EmbeddedServletOptions.java JspC.java Options.java jasper2/src/share/org/apache/jasper/compiler AntCompiler.java JDTCompiler.java Log: Added compilerTargetVM option support, "1.4" default. Revision ChangesPath 1.13 +17 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java Index: EmbeddedServletOptions.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- EmbeddedServletOptions.java 1 Sep 2004 22:54:13 - 1.12 +++ EmbeddedServletOptions.java 2 Sep 2004 16:05:06 - 1.13 @@ -139,6 +139,11 @@ private String compiler = null; /** + * Compiler target VM. + */ +private String compilerTargetVM = "1.4"; + +/** * Cache for the TLD locations */ private TldLocationsCache tldLocationsCache = null; @@ -291,6 +296,13 @@ return compiler; } +/** + * @see Options#getCompilerTargetVM + */ +public String getCompilerTargetVM() { +return compilerTargetVM; +} + public boolean getErrorOnUseBeanInvalidClassAttribute() { return errorOnUseBeanInvalidClassAttribute; } @@ -553,6 +565,11 @@ scratchDir.getAbsolutePath())); this.compiler = config.getInitParameter("compiler"); + +String compilerTargetVM = config.getInitParameter("compilerTargetVM"); +if(compilerTargetVM != null) { +this.compilerTargetVM = compilerTargetVM; +} String javaEncoding = config.getInitParameter("javaEncoding"); if (javaEncoding != null) { 1.81 +15 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java Index: JspC.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- JspC.java 16 Jun 2004 14:20:17 - 1.80 +++ JspC.java 2 Sep 2004 16:05:06 - 1.81 @@ -142,7 +142,11 @@ private int dieLevel; private boolean helpNeeded = false; private boolean compile = false; + private String compiler = null; + +private String compilerTargetVM = "1.4"; + private boolean classDebugInfo = true; private Vector extensions; private Vector pages = new Vector(); @@ -460,6 +464,17 @@ public void setCompiler(String c) { compiler=c; +} + +/** + * @see Options#getCompilerTargetVM + */ +public String getCompilerTargetVM() { +return compilerTargetVM; +} + +public void setCompileTargetVM(String vm) { +compilerTargetVM = vm; } public TldLocationsCache getTldLocationsCache() { 1.24 +5 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java Index: Options.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/Options.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Options.java 17 Mar 2004 19:23:03 - 1.23 +++ Options.java 2 Sep 2004 16:05:06 - 1.24 @@ -117,6 +117,11 @@ public String getCompiler(); /** + * The compiler target VM, e.g. 1.1, 1.2, 1.3, or 1.4. + */ +public String getCompilerTargetVM(); + +/** * The cache for the location of the TLD's * for the various tag libraries 'exposed' * by the web application. 1.2 +5 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java Index: AntCompiler.java === RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AntCompiler.java 16 Aug 2004 23:48:35 - 1.1 +++ AntCompiler.java 2 Sep 2004 16:05:06 - 1.2 @@ -170,6 +170,11 @@ javac.setCompiler(options.getCompiler()); info.append("compiler=" + options.getCompiler() + "\n"); } + +if (options.getCompilerTargetVM() != null) { +javac.setTarget(options.getCompilerTargetVM()); +