svn commit: r1040432 - in /openwebbeans/trunk: webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/ webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/ webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/

[gerdogdu]

Author: gerdogdu
Date: Tue Nov 30 08:20:03 2010
New Revision: 1040432

URL: http://svn.apache.org/viewvc?rev=1040432&view=rev
Log:
OWB-502 Prevent compile errors from David Jencks commits

Modified:
    
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java

Modified: 
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java?rev=1040432&r1=1040431&r2=1040432&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
 Tue Nov 30 08:20:03 2010
@@ -108,7 +108,8 @@ public class CdiTestOpenWebBeansContaine
         ContextFactory.destroyApplicationContext(servletContext);
         ContextFactory.destroySingletonContext(servletContext);
 
-        ContextFactory.cleanUpContextFactory();
+        //Comment out for OWB-502
+        //ContextFactory.cleanUpContextFactory();
     }
 
     @Override

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1040432&r1=1040431&r2=1040432&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
 Tue Nov 30 08:20:03 2010
@@ -21,7 +21,6 @@ package org.apache.webbeans.web.lifecycl
 import org.apache.webbeans.component.InjectionPointBean;
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
-import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansException;
@@ -164,7 +163,8 @@ public final class WebContainerLifecycle
             injectionServices.clear();
         }
 
-        ContextFactory.cleanUpContextFactory();
+        //Comment out for commit OWB-502
+        //ContextFactory.cleanUpContextFactory();
 
         this.cleanupShutdownThreadLocals();
         

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java?rev=1040432&r1=1040431&r2=1040432&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
 Tue Nov 30 08:20:03 2010
@@ -68,7 +68,8 @@ public class EnterpriseTestLifeCycle ext
         ContextFactory.destroyConversationContext();        
         
ContextFactory.destroyApplicationContext(this.servletContextEvent.getServletContext());
 
-        ContextFactory.cleanUpContextFactory();
+        //Comment out for OWB-502
+        //ContextFactory.cleanUpContextFactory();
 
         // clean up the EL caches after each request
         ELContextStore elStore = ELContextStore.getInstance(false);