Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 72003 invoked from network); 2 Sep 2004 15:20:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 2 Sep 2004 15:20:41 -0000 Received: (qmail 7462 invoked by uid 500); 2 Sep 2004 15:19:33 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 7318 invoked by uid 500); 2 Sep 2004 15:19:32 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 7189 invoked by uid 500); 2 Sep 2004 15:19:30 -0000 Received: (qmail 7159 invoked by uid 99); 2 Sep 2004 15:19:29 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 02 Sep 2004 08:19:28 -0700 Received: (qmail 71431 invoked by uid 1670); 2 Sep 2004 15:19:27 -0000 Date: 2 Sep 2004 15:19:27 -0000 Message-ID: <20040902151927.71430.qmail@minotaur.apache.org> From: yoavs@apache.org To: jakarta-tomcat-jasper-cvs@apache.org Subject: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N yoavs 2004/09/02 08:19:27 Modified: catalina/src/share/org/apache/catalina/startup Tag: TOMCAT_5_0 DigesterFactory.java webapps/docs Tag: TOMCAT_5_0 changelog.xml jasper2/src/share/org/apache/jasper Tag: TOMCAT_5_0 EmbeddedServletOptions.java JspC.java Options.java jasper2/src/share/org/apache/jasper/compiler Tag: TOMCAT_5_0 Compiler.java Log: Added compilerTargetVM option to allow passing javac a target (1.1, 1.2, 1.3, 1.4 etc.) argument. Revision Changes Path No revision No revision 1.6.2.2 +1 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java Index: DigesterFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/DigesterFactory.java,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- DigesterFactory.java 2 Sep 2004 14:24:54 -0000 1.6.2.1 +++ DigesterFactory.java 2 Sep 2004 15:19:26 -0000 1.6.2.2 @@ -35,7 +35,7 @@ /** * Log for logging ;) */ - private static org.apache.commons.logging.Log = + private static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(DigesterFactory.class); /** No revision No revision 1.70.2.26 +7 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.70.2.25 retrieving revision 1.70.2.26 diff -u -r1.70.2.25 -r1.70.2.26 --- changelog.xml 2 Sep 2004 14:24:54 -0000 1.70.2.25 +++ changelog.xml 2 Sep 2004 15:19:26 -0000 1.70.2.26 @@ -66,6 +66,13 @@ + + + + 30984: Added compilerTargetVM option to Jasper. (yoavs) + + +
No revision No revision 1.10.2.1 +16 -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.10 retrieving revision 1.10.2.1 diff -u -r1.10 -r1.10.2.1 --- EmbeddedServletOptions.java 17 Mar 2004 19:23:03 -0000 1.10 +++ EmbeddedServletOptions.java 2 Sep 2004 15:19:26 -0000 1.10.2.1 @@ -139,6 +139,11 @@ private String compiler = null; /** + * The compiler target VM ("1.2" by default). + */ + private String compilerTargetVM = "1.2"; + + /** * 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,10 @@ scratchDir.getAbsolutePath())); this.compiler = config.getInitParameter("compiler"); + compilerTargetVM = config.getInitParameter("compilerTargetVM"); + if(compilerTargetVM != null) { + this.compilerTargetVM = compilerTargetVM; + } String javaEncoding = config.getInitParameter("javaEncoding"); if (javaEncoding != null) { 1.80.2.1 +17 -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.80.2.1 diff -u -r1.80 -r1.80.2.1 --- JspC.java 16 Jun 2004 14:20:17 -0000 1.80 +++ JspC.java 2 Sep 2004 15:19:26 -0000 1.80.2.1 @@ -142,7 +142,10 @@ private int dieLevel; private boolean helpNeeded = false; private boolean compile = false; + private String compiler = null; + private String compilerTargetVM = "1.2"; + private boolean classDebugInfo = true; private Vector extensions; private Vector pages = new Vector(); @@ -460,6 +463,20 @@ public void setCompiler(String c) { compiler=c; + } + + /** + * @see Options#getCompilerTargetVM. + */ + public String getCompilerTargetVM() { + return compilerTargetVM; + } + + /** + * @see Options#getCompilerTargetVM. + */ + public void setCompilerTargetVM(String vm) { + compilerTargetVM = vm; } public TldLocationsCache getTldLocationsCache() { 1.23.2.1 +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.23.2.1 diff -u -r1.23 -r1.23.2.1 --- Options.java 17 Mar 2004 19:23:03 -0000 1.23 +++ Options.java 2 Sep 2004 15:19:26 -0000 1.23.2.1 @@ -117,6 +117,11 @@ public String getCompiler(); /** + * 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. No revision No revision 1.88.2.1 +5 -0 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java Index: Compiler.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v retrieving revision 1.88 retrieving revision 1.88.2.1 diff -u -r1.88 -r1.88.2.1 --- Compiler.java 15 Jun 2004 21:30:35 -0000 1.88 +++ Compiler.java 2 Sep 2004 15:19:26 -0000 1.88.2.1 @@ -366,6 +366,11 @@ info.append(" compiler=" + options.getCompiler() + "\n"); } + if (options.getCompilerTargetVM() != null) { + javac.setTarget(options.getCompilerTargetVM()); + info.append(" compilerTargetVM=" + options.getCompilerTargetVM() + "\n"); + } + // Build includes path PatternSet.NameEntry includes = javac.createInclude(); --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org