[jboss-cvs] repository.jboss.com/apache-tomcat/5.5.9.patch01/src ...

[Vivek Lakshmanan]

  User: vivekl  
  Date: 06/12/18 21:51:58

  Modified:    apache-tomcat/5.5.9.patch01/src   tomcat5-5.5.9-jboss.patch
  Added:       apache-tomcat/5.5.9.patch01/src  
                        tomcat5-5.5.9.patch01-JspServlet-5.15.17-backport.patch
  Log:
  Tomcat 5.5.9 with additional patch to add support for custom options parser.
  
  Revision  Changes    Path
  1.2       +0 -0      repository.jboss.com/apache-tomcat/5.5.9.patch01/src/tomcat5-5.5.9-jboss.patch
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: tomcat5-5.5.9-jboss.patch
  ===================================================================
  RCS file: /cvsroot/jboss/repository.jboss.com/apache-tomcat/5.5.9.patch01/src/tomcat5-5.5.9-jboss.patch,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- tomcat5-5.5.9-jboss.patch	1 Nov 2006 15:56:32 -0000	1.1
  +++ tomcat5-5.5.9-jboss.patch	19 Dec 2006 02:51:58 -0000	1.2
  @@ -187,7 +187,7 @@
   + *
   + * @author Craig R. McClanahan
   + * @author Remy Maucherat
  -+ * @version $Revision: 1.1 $ $Date: 2006/11/01 15:56:32 $
  ++ * @version $Revision: 1.2 $ $Date: 2006/12/19 02:51:58 $
   + */
   +
   +public class StandardContext
  
  
  
  1.1      date: 2006/12/19 02:51:58;  author: vivekl;  state: Exp;repository.jboss.com/apache-tomcat/5.5.9.patch01/src/tomcat5-5.5.9.patch01-JspServlet-5.15.17-backport.patch
  
  Index: tomcat5-5.5.9.patch01-JspServlet-5.15.17-backport.patch
  ===================================================================
  --- jakarta-tomcat-5.5.9-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java.old	2005-03-26 17:22:44.000000000 -0500
  +++ jakarta-tomcat-5.5.9-src/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServlet.java	2006-12-12 15:21:50.000000000 -0500
  @@ -17,6 +17,7 @@
   package org.apache.jasper.servlet;
   
   import java.io.IOException;
  +import java.lang.reflect.Constructor;
   import java.util.Enumeration;
   
   import javax.servlet.ServletConfig;
  @@ -72,7 +73,29 @@
   	this.context = config.getServletContext();
   
           // Initialize the JSP Runtime Context
  -        options = new EmbeddedServletOptions(config, context);
  +        // Check for a custom Options implementation
  +        String engineOptionsName = 
  +            config.getInitParameter("engineOptionsClass");
  +        if (engineOptionsName != null) {
  +            // Instantiate the indicated Options implementation
  +            try {
  +                ClassLoader loader = Thread.currentThread()
  +                        .getContextClassLoader();
  +                Class engineOptionsClass = loader.loadClass(engineOptionsName);
  +                Class[] ctorSig = { ServletConfig.class, ServletContext.class };
  +                Constructor ctor = engineOptionsClass.getConstructor(ctorSig);
  +                Object[] args = { config, context };
  +                options = (Options) ctor.newInstance(args);
  +            } catch (Throwable e) {
  +                // Need to localize this.
  +                log.warn("Failed to load engineOptionsClass", e);
  +                // Use the default Options implementation
  +                options = new EmbeddedServletOptions(config, context);
  +            }
  +        } else {
  +            // Use the default Options implementation
  +            options = new EmbeddedServletOptions(config, context);
  +        }
           rctxt = new JspRuntimeContext(context,options);
   
   	if (log.isDebugEnabled()) {