[Jboss-cvs] JBossAS SVN: r57000 - in trunk/tomcat/src/main/org/jboss/web/tomcat: tc5/jasper tc6/jasper

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2006-09-20 06:41:42 -0400 (Wed, 20 Sep 2006)
New Revision: 57000

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/jasper/JspServletOptions.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/jasper/JspServletOptions.java
Log:
added compilerClassName option

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/jasper/JspServletOptions.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/jasper/JspServletOptions.java	2006-09-20 09:53:04 UTC (rev 56999)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc5/jasper/JspServletOptions.java	2006-09-20 10:41:42 UTC (rev 57000)
@@ -136,6 +136,11 @@
    private String compiler = null;
 
    /**
+    * The compiler class name.
+    */
+   private String compilerClassName = null;
+   
+   /**
     * Compiler target VM.
     */
    private String compilerTargetVM = "1.4";
@@ -338,6 +343,14 @@
    }
 
    /**
+    * @see Options#getCompilerClassName
+    */
+   public String getCompilerClassName()
+   {
+      return compilerClassName;
+   }
+   
+   /**
     * @see Options#getCompilerTargetVM
     */
    public String getCompilerTargetVM()
@@ -711,6 +724,12 @@
          this.javaEncoding = javaEncoding;
       }
 
+      String compilerClassName = config.getInitParameter("compilerClassName");
+      if(compilerClassName != null)
+      {
+         this.compilerClassName = compilerClassName;
+      }
+      
       String fork = config.getInitParameter("fork");
       if (fork != null)
       {

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/jasper/JspServletOptions.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/jasper/JspServletOptions.java	2006-09-20 09:53:04 UTC (rev 56999)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/jasper/JspServletOptions.java	2006-09-20 10:41:42 UTC (rev 57000)
@@ -136,6 +136,11 @@
    private String compiler = null;
 
    /**
+    * The compiler class name.
+    */
+   private String compilerClassName = null;
+   
+   /**
     * Compiler target VM.
     */
    private String compilerTargetVM = "1.4";
@@ -338,6 +343,14 @@
    }
 
    /**
+    * @see Options#getCompilerClassName
+    */
+   public String getCompilerClassName()
+   {
+      return compilerClassName;
+   }
+   
+   /**
     * @see Options#getCompilerTargetVM
     */
    public String getCompilerTargetVM()
@@ -711,6 +724,12 @@
          this.javaEncoding = javaEncoding;
       }
 
+      String compilerClassName = config.getInitParameter("compilerClassName");
+      if(compilerClassName != null)
+      {
+         this.compilerClassName = compilerClassName;
+      }
+      
       String fork = config.getInitParameter("fork");
       if (fork != null)
       {