svn commit: r1372684 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

[rmannibucau]

Author: rmannibucau
Date: Tue Aug 14 00:23:05 2012
New Revision: 1372684

URL: http://svn.apache.org/viewvc?rev=1372684&view=rev
Log:
reactivating myfaces listener - the tld register it a second time for the 
moment but without it never works out of the box

Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1372684&r1=1372683&r2=1372684&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
 Tue Aug 14 00:23:05 2012
@@ -33,6 +33,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -41,7 +42,7 @@ public class OpenEJBContextConfig extend
 
     private static Logger logger = Logger.getInstance(LogCategory.OPENEJB, 
OpenEJBContextConfig.class);
 
-    // private static final String MYFACES_STARTUP_SERVLET_CONTEXT_LISTENER = 
"org.apache.myfaces.webapp.StartupServletContextListener";
+    private static final String MYFACES_STARTUP_SERVLET_CONTEXT_LISTENER = 
"org.apache.myfaces.webapp.StartupServletContextListener";
     private static final String MYFACES_TOMEEM_CONTAINER_INITIALIZER = 
"org.apache.tomee.myfaces.TomEEMyFacesContainerInitializer";
     private static final String TOMEE_MYFACES_CONTEXT_LISTENER = 
"org.apache.tomee.myfaces.TomEEMyFacesContextListener";
 
@@ -90,11 +91,9 @@ public class OpenEJBContextConfig extend
             final Class<?> myfacesInitializer = 
Class.forName(MYFACES_TOMEEM_CONTAINER_INITIALIZER, true, 
context.getLoader().getClassLoader());
             final ServletContainerInitializer instance = 
(ServletContainerInitializer) myfacesInitializer.newInstance();
             context.addServletContainerInitializer(instance, 
getJsfClasses(context));
-            /* done through myfaces tld automatically
-            if 
(!Arrays.asList(context.findApplicationListeners()).contains(MYFACES_STARTUP_SERVLET_CONTEXT_LISTENER))
 {
+            if 
(!Arrays.asList(context.findApplicationListeners()).contains(MYFACES_STARTUP_SERVLET_CONTEXT_LISTENER))
 { // todo: probably do another listener (a delegator) which knows the context 
and is abl to skip itself
                 
context.addApplicationListener(MYFACES_STARTUP_SERVLET_CONTEXT_LISTENER);
             }
-            */
             context.addApplicationListener(TOMEE_MYFACES_CONTEXT_LISTENER); // 
cleanup listener
         } catch (Exception ignored) {
             // no-op