tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper EmbeddedServletOptions.java JspC.java
Date Thu, 02 Sep 2004 16:08:04 GMT
yoavs       2004/09/02 09:08:03

  Modified:    jasper2/src/share/org/apache/jasper Tag: TOMCAT_5_0
                        EmbeddedServletOptions.java JspC.java
  Log:
  Made default target 1.3 instead of 1.2 and cleaned up a typo bug in reading the property
for EmbeddedServletOptions.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.10.2.2  +4 -3      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.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- EmbeddedServletOptions.java	2 Sep 2004 15:19:26 -0000	1.10.2.1
  +++ EmbeddedServletOptions.java	2 Sep 2004 16:08:03 -0000	1.10.2.2
  @@ -139,9 +139,9 @@
       private String compiler = null;
   
       /**
  -     * The compiler target VM ("1.2" by default).
  +     * The compiler target VM ("1.3" by default).
        */
  -    private String compilerTargetVM = "1.2";
  +    private String compilerTargetVM = "1.3";
   
       /**
        * Cache for the TLD locations
  @@ -565,7 +565,8 @@
   					   scratchDir.getAbsolutePath()));
                                     
           this.compiler = config.getInitParameter("compiler");
  -        compilerTargetVM = config.getInitParameter("compilerTargetVM");
  +
  +        String compilerTargetVM = config.getInitParameter("compilerTargetVM");
           if(compilerTargetVM != null) {
               this.compilerTargetVM = compilerTargetVM;
           }
  
  
  
  1.80.2.2  +1 -1      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.2.1
  retrieving revision 1.80.2.2
  diff -u -r1.80.2.1 -r1.80.2.2
  --- JspC.java	2 Sep 2004 15:19:26 -0000	1.80.2.1
  +++ JspC.java	2 Sep 2004 16:08:03 -0000	1.80.2.2
  @@ -144,7 +144,7 @@
       private boolean compile = false;
   
       private String compiler = null;
  -    private String compilerTargetVM = "1.2";
  +    private String compilerTargetVM = "1.3";
   
       private boolean classDebugInfo = true;
       private Vector extensions;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message