[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Norman Richards]

  User: nrichards
  Date: 07/04/30 12:23:24

  Modified:    src/main/org/jboss/seam/core  JBossELInstaller.java
  Log:
  JBSEAM-1265: don't use the tomcat6 code now
  
  Revision  Changes    Path
  1.2       +33 -33    jboss-seam/src/main/org/jboss/seam/core/JBossELInstaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossELInstaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/JBossELInstaller.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- JBossELInstaller.java	26 Apr 2007 18:11:42 -0000	1.1
  +++ JBossELInstaller.java	30 Apr 2007 16:23:24 -0000	1.2
  @@ -5,7 +5,7 @@
   import javassist.util.proxy.MethodFilter;
   import javassist.util.proxy.MethodHandler;
   import javassist.util.proxy.ProxyFactory;
  -import javax.servlet.jsp.JspApplicationContext;
  +//import javax.servlet.jsp.JspApplicationContext;
   
   import org.jboss.el.ExpressionFactoryImpl;
   import org.jboss.seam.ScopeType;
  @@ -30,7 +30,7 @@
   
       @Create
       public void installJBossEL() {                   
  -        configureTomcatApplicationContext();
  +//        configureTomcatApplicationContext();
           configureRIAssociate();
       }
   
  @@ -50,36 +50,36 @@
           }
       }
   
  -    /**
  -     * Set the expression factory for the tomcat JSPApplicationContext associated with this deployment.
  -     * This works, but the use EL enhancements in JSPs will be rejected by tomcat as invalid.  
  -     */
  -    public void configureTomcatApplicationContext() {
  -        Context appContext = Contexts.getApplicationContext();
  -        JspApplicationContext target = (JspApplicationContext)appContext.get(TOMCAT_APPLICATION_CONTEXT);
  -        if (target != null) {
  -            ProxyFactory factory = new ProxyFactory();
  -            factory.setSuperclass( target.getClass());
  -            factory.setFilter(new MethodFilter() {
  -                public boolean isHandled(Method method) {
  -                    return method.getName().equals("getExpressionFactory");
  -                }                
  -            });
  -            factory.setHandler(new MethodHandler() {
  -                public Object invoke(Object arg0, Method arg1, Method arg2, Object[] arg3) throws Throwable {
  -                    return new ExpressionFactoryImpl();
  -                }
  -            });
  -
  -            try {
  -                target = (JspApplicationContext) factory.create(new Class[0], new Object[0]);
  -
  -                appContext.set(TOMCAT_APPLICATION_CONTEXT, target);
  -                log.debug("replaced tomcat application context");
  -            } catch (Exception e ) {
  -                log.error("couldn't replace tomcat application context", e);
  -            }
  -        }
  -    }
  +//     /**
  +//      * Set the expression factory for the tomcat JSPApplicationContext associated with this deployment.
  +//      * This works, but the use EL enhancements in JSPs will be rejected by tomcat as invalid.  
  +//      */
  +//     public void configureTomcatApplicationContext() {
  +//         Context appContext = Contexts.getApplicationContext();
  +//         JspApplicationContext target = (JspApplicationContext)appContext.get(TOMCAT_APPLICATION_CONTEXT);
  +//         if (target != null) {
  +//             ProxyFactory factory = new ProxyFactory();
  +//             factory.setSuperclass( target.getClass());
  +//             factory.setFilter(new MethodFilter() {
  +//                 public boolean isHandled(Method method) {
  +//                     return method.getName().equals("getExpressionFactory");
  +//                 }                
  +//             });
  +//             factory.setHandler(new MethodHandler() {
  +//                 public Object invoke(Object arg0, Method arg1, Method arg2, Object[] arg3) throws Throwable {
  +//                     return new ExpressionFactoryImpl();
  +//                 }
  +//             });
  +
  +//             try {
  +//                 target = (JspApplicationContext) factory.create(new Class[0], new Object[0]);
  +
  +//                 appContext.set(TOMCAT_APPLICATION_CONTEXT, target);
  +//                 log.debug("replaced tomcat application context");
  +//             } catch (Exception e ) {
  +//                 log.error("couldn't replace tomcat application context", e);
  +//             }
  +//         }
  +//     }
   
   }