openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1042099 [4/4] - in /openwebbeans/trunk: samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/ webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/ webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/interc...
Date Sat, 04 Dec 2010 04:27:24 GMT
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLAnnotTypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLAnnotTypeTest.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLAnnotTypeTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLAnnotTypeTest.java
Sat Dec  4 04:27:19 2010
@@ -24,9 +24,9 @@ import java.util.Set;
 
 import junit.framework.Assert;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.xml.WebBeansXMLConfigurator;
-import org.apache.webbeans.xml.XMLAnnotationTypeManager;
 import org.junit.Test;
 
 public class XMLAnnotTypeTest extends TestContext
@@ -50,7 +50,7 @@ public class XMLAnnotTypeTest extends Te
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureOwbSpecific(stream, "bindingTypeAnnot.xml");
 
-        Set<Class<? extends Annotation>> aanns = XMLAnnotationTypeManager.getInstance().getBindingTypes();
+        Set<Class<? extends Annotation>> aanns = WebBeansContext.getInstance().getxMLAnnotationTypeManager().getBindingTypes();
 
         Assert.assertEquals(2, aanns.size());
     }

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/definition/XMLDefinitionTest.java
Sat Dec  4 04:27:19 2010
@@ -22,9 +22,8 @@ import junit.framework.Assert;
 
 import org.apache.webbeans.component.AbstractOwbBean;
 import org.apache.webbeans.component.xml.XMLManagedBean;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.context.creational.CreationalContextFactory;
-import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.xml.definition.Definition1;
 import org.apache.webbeans.test.xml.definition.Definition2;
@@ -48,13 +47,13 @@ public class XMLDefinitionTest extends T
         initDependentContext();
 
         // initialize the plugin. There are no plugins, but we should not get any NPEs
-        PluginLoader.getInstance().startUp();
+        WebBeansContext.getInstance().getPluginLoader().startUp();
     }
 
     @After
     public void shutDown()
     {
-        PluginLoader.getInstance().shutDown();
+        WebBeansContext.getInstance().getPluginLoader().shutDown();
     }
     
     @Test
@@ -66,7 +65,7 @@ public class XMLDefinitionTest extends T
 
         Assert.assertEquals("definition1", compDef.getName());
 
-        Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
+        Object instance = compDef.create(WebBeansContext.getInstance().getCreationalContextFactory().getCreationalContext(compDef));
 
         Assert.assertNotNull(instance);
         Assert.assertTrue(instance instanceof Definition1);
@@ -79,7 +78,7 @@ public class XMLDefinitionTest extends T
 
         XMLManagedBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/definition2.xml");
 
-        Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
+        Object instance = compDef.create(WebBeansContext.getInstance().getCreationalContextFactory().getCreationalContext(compDef));
 
         Assert.assertNotNull(instance);
         Assert.assertTrue(instance instanceof Definition2);
@@ -123,7 +122,7 @@ public class XMLDefinitionTest extends T
         // an unnamed bean must not have a name
         Assert.assertNull(compDef.getName());
 
-        Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
+        Object instance = compDef.create(WebBeansContext.getInstance().getCreationalContextFactory().getCreationalContext(compDef));
         Assert.assertNotNull(instance);
         Assert.assertTrue(instance instanceof TstBeanUnnamed);
     }
@@ -154,7 +153,7 @@ public class XMLDefinitionTest extends T
 
         AbstractOwbBean<?> compDef = getWebBeanFromXml("org/apache/webbeans/test/xml/definition/testBeanConstructor2.xml",
TstBeanConstructor.class);
 
-        Object instance = compDef.create(CreationalContextFactory.getInstance().getCreationalContext(compDef));
+        Object instance = compDef.create(WebBeansContext.getInstance().getCreationalContextFactory().getCreationalContext(compDef));
         Assert.assertNotNull(instance);
         Assert.assertTrue(instance instanceof TstBeanConstructor);
 

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
Sat Dec  4 04:27:19 2010
@@ -24,6 +24,7 @@ import javax.enterprise.inject.spi.Bean;
 
 import junit.framework.Assert;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.inject.AlternativesManager;
 import org.apache.webbeans.test.TestContext;
@@ -51,8 +52,8 @@ public class AlternativesTest extends Te
 
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "alternatives_correct.xml");
-        
-        AlternativesManager manager = AlternativesManager.getInstance();
+
+        AlternativesManager manager = WebBeansContext.getInstance().getAlternativesManager();
         
         Assert.assertTrue(manager.isBeanHasAlternative(alternative1));
         Assert.assertTrue(manager.isBeanHasAlternative(alternative2));

Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java
Sat Dec  4 04:27:19 2010
@@ -22,8 +22,7 @@ import java.io.InputStream;
 
 import junit.framework.Assert;
 
-import org.apache.webbeans.decorator.DecoratorsManager;
-import org.apache.webbeans.intercept.InterceptorsManager;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.test.TestContext;
 import org.apache.webbeans.test.unittests.xml.XMLTest;
 import org.apache.webbeans.test.xml.strict.DummyDecorator;
@@ -46,8 +45,8 @@ public class XMLSpecStrictTest extends T
 
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "decorators.xml");
-        
-        boolean enable = DecoratorsManager.getInstance().isDecoratorEnabled(DummyDecorator.class);
+
+        boolean enable = WebBeansContext.getInstance().getDecoratorsManager().isDecoratorEnabled(DummyDecorator.class);
         Assert.assertTrue(enable);
     }
     
@@ -59,8 +58,8 @@ public class XMLSpecStrictTest extends T
 
         WebBeansXMLConfigurator configurator = new WebBeansXMLConfigurator();
         configurator.configureSpecSpecific(stream, "interceptors.xml");
-        
-        boolean enable = InterceptorsManager.getInstance().isInterceptorEnabled(DummyInterceptor.class);
+
+        boolean enable = WebBeansContext.getInstance().getInterceptorsManager().isInterceptorEnabled(DummyInterceptor.class);
         Assert.assertTrue(enable);
     }
     

Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
(original)
+++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
Sat Dec  4 04:27:19 2010
@@ -40,13 +40,12 @@ import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansCreationException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.jms.JMSModel;
 import org.apache.webbeans.jms.component.JmsBean;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.util.Asserts;
 
@@ -139,7 +138,7 @@ public final class JmsUtil
     
     public static ConnectionFactory getConnectionFactory()
     {
-        String connectionFactoryJndiName = OpenWebBeansConfiguration.getInstance().getProperty(JNDIService.JMS_CONNECTION_FACTORY_JNDI_KEY);
+        String connectionFactoryJndiName = WebBeansContext.getInstance().getOpenWebBeansConfiguration().getProperty(JNDIService.JMS_CONNECTION_FACTORY_JNDI_KEY);
         
         if(connectionFactoryJndiName == null || connectionFactoryJndiName.equals(""))
         {
@@ -180,7 +179,7 @@ public final class JmsUtil
             
             pf.setHandler(new JmsProxyHandler(jmsComponent,intf));
 
-            result = JavassistProxyFactory.getInstance().getProxyClass(pf).newInstance();
+            result = WebBeansContext.getInstance().getJavassistProxyFactory().getProxyClass(pf).newInstance();
 
         }
         catch (Exception e)

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
Sat Dec  4 04:27:19 2010
@@ -26,6 +26,7 @@ import javax.faces.application.ViewHandl
 import javax.faces.application.ViewHandlerWrapper;
 import javax.faces.context.FacesContext;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.conversation.ConversationManager;
 
 public class ConversationAwareViewHandler extends ViewHandlerWrapper
@@ -50,7 +51,7 @@ public class ConversationAwareViewHandle
         
         String url = delegate.getActionURL(context, viewId);
 
-        ConversationManager conversationManager = ConversationManager.getInstance();
+        ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
         Conversation conversation = conversationManager.getConversationBeanReference();
         if (conversation != null && !conversation.isTransient())
         {
@@ -84,7 +85,7 @@ public class ConversationAwareViewHandle
                 return url;
             }
         }
-        ConversationManager conversationManager = ConversationManager.getInstance();
+        ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
         Conversation conversation = conversationManager.getConversationBeanReference();
         if (conversation != null && !conversation.isTransient())
         {

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/OwbApplication.java
Sat Dec  4 04:27:19 2010
@@ -51,7 +51,7 @@ import javax.faces.event.SystemEvent;
 import javax.faces.event.SystemEventListener;
 import javax.faces.validator.Validator;
 
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.spi.adaptor.ELAdaptor;
 
@@ -289,7 +289,7 @@ public class OwbApplication extends Appl
         if(this.expressionFactory == null)
         {
             expressionFactory = wrappedApplication.getExpressionFactory();
-            expressionFactory = BeanManagerImpl.getManager().wrapExpressionFactory(expressionFactory);
           
+            expressionFactory = WebBeansContext.getInstance().getBeanManagerImpl().wrapExpressionFactory(expressionFactory);
         }
         
         return expressionFactory;

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
Sat Dec  4 04:27:19 2010
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.config.WebBeansContext;
 
 public class WebBeansJSFFilter implements Filter
 {
@@ -57,8 +57,8 @@ public class WebBeansJSFFilter implement
             @Override
             public void sendRedirect(String location) throws IOException
             {
-                Bean<?> bean = BeanManagerImpl.getManager().resolveByType(Conversation.class,
new DefaultLiteral()).iterator().next();
-                Conversation conversation = (Conversation)BeanManagerImpl.getManager().getInstance(bean,null);
+                Bean<?> bean = WebBeansContext.getInstance().getBeanManagerImpl().resolveByType(Conversation.class,
new DefaultLiteral()).iterator().next();
+                Conversation conversation = (Conversation) WebBeansContext.getInstance().getBeanManagerImpl().getInstance(bean,null);
 
                 String path = location;
 

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
Sat Dec  4 04:27:19 2010
@@ -25,6 +25,7 @@ import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.conversation.ConversationImpl;
@@ -56,8 +57,8 @@ public class WebBeansPhaseListener imple
             {
                 return;
             }
-            
-            ConversationManager conversationManager = ConversationManager.getInstance();
+
+            ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
             Conversation conversation = conversationManager.getConversationBeanReference();
 
             if (conversation.isTransient())
@@ -86,7 +87,7 @@ public class WebBeansPhaseListener imple
             //It looks for cid parameter in the JSF request.
             //If request contains cid, then it must restore conversation
             //Otherwise create NonexistentException
-            ConversationManager conversationManager = ConversationManager.getInstance();
+            ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
             Conversation conversation = conversationManager.getConversationBeanReference();
             String cid = JSFUtil.getConversationId();
 

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/Jsf2ScopesExtension.java
Sat Dec  4 04:27:19 2010
@@ -26,7 +26,7 @@ import javax.enterprise.inject.spi.After
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
 
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.util.ClassUtil;
 
@@ -41,7 +41,7 @@ public class Jsf2ScopesExtension impleme
     
     public void addViewScoped(@Observes BeforeBeanDiscovery beforeBeanDiscovery)
     {
-        if(OpenWebBeansConfiguration.getInstance().isUseJSF2Extensions())
+        if(WebBeansContext.getInstance().getOpenWebBeansConfiguration().isUseJSF2Extensions())
         {
             @SuppressWarnings("unchecked")
             Class<? extends Annotation> clazz = (Class<? extends Annotation>)ClassUtil.getClassFromName("javax.faces.bean.ViewScoped");
@@ -51,7 +51,7 @@ public class Jsf2ScopesExtension impleme
     
     public void registerViewContext(@Observes AfterBeanDiscovery afterBeanDiscovery)
     {
-        if(OpenWebBeansConfiguration.getInstance().isUseJSF2Extensions())
+        if(WebBeansContext.getInstance().getOpenWebBeansConfiguration().isUseJSF2Extensions())
         {
             try
             {

Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java
(original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/ConversationAwareViewHandler.java
Sat Dec  4 04:27:19 2010
@@ -23,6 +23,7 @@ import javax.faces.application.ViewHandl
 import javax.faces.application.ViewHandlerWrapper;
 import javax.faces.context.FacesContext;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.conversation.ConversationManager;
 
 public class ConversationAwareViewHandler extends ViewHandlerWrapper
@@ -47,7 +48,7 @@ public class ConversationAwareViewHandle
         
         String url = delegate.getActionURL(context, viewId);
 
-        ConversationManager conversationManager = ConversationManager.getInstance();
+        ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
         Conversation conversation = conversationManager.getConversationBeanReference();
         if (conversation != null && !conversation.isTransient())
         {

Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplication.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplication.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplication.java
(original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/OwbApplication.java
Sat Dec  4 04:27:19 2010
@@ -43,7 +43,7 @@ import javax.faces.el.VariableResolver;
 import javax.faces.event.ActionListener;
 import javax.faces.validator.Validator;
 
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.config.WebBeansContext;
 
 @SuppressWarnings("unchecked")
 public class OwbApplication extends Application
@@ -257,7 +257,7 @@ public class OwbApplication extends Appl
         if(this.expressionFactory == null)
         {
             expressionFactory = wrappedApplication.getExpressionFactory();
-            expressionFactory = BeanManagerImpl.getManager().wrapExpressionFactory(expressionFactory);
           
+            expressionFactory = WebBeansContext.getInstance().getBeanManagerImpl().wrapExpressionFactory(expressionFactory);
         }
         
         return expressionFactory;

Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansJSFFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansJSFFilter.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansJSFFilter.java
(original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansJSFFilter.java
Sat Dec  4 04:27:19 2010
@@ -30,6 +30,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.conversation.ConversationManager;
 
 public class WebBeansJSFFilter implements Filter
@@ -65,7 +66,7 @@ public class WebBeansJSFFilter implement
                 
                 if(!ok)
                 {
-                    ConversationManager conversationManager = ConversationManager.getInstance();
+                    ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
                     Conversation conversation = conversationManager.getConversationBeanReference();
                     if (conversation != null && !conversation.isTransient())
                     {

Modified: openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java
(original)
+++ openwebbeans/trunk/webbeans-jsf12/src/main/java/org/apache/webbeans/jsf12/WebBeansPhaseListener.java
Sat Dec  4 04:27:19 2010
@@ -25,6 +25,7 @@ import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.conversation.ConversationImpl;
@@ -57,7 +58,7 @@ public class WebBeansPhaseListener imple
         if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE) ||
                 phaseEvent.getFacesContext().getResponseComplete())
         {
-            ConversationManager conversationManager = ConversationManager.getInstance();
+            ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
             Conversation conversation = conversationManager.getConversationBeanReference();
 
             if (conversation.isTransient())
@@ -91,7 +92,7 @@ public class WebBeansPhaseListener imple
             //It looks for cid parameter in the JSF request.
             //If request contains cid, then it must restore conversation
             //Otherwise create NonexistentException
-            ConversationManager conversationManager = ConversationManager.getInstance();
+            ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
             Conversation conversation = conversationManager.getConversationBeanReference();
             String cid = JSFUtil.getConversationId();
 

Modified: openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
(original)
+++ openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/EjbPlugin.java
Sat Dec  4 04:27:19 2010
@@ -50,6 +50,7 @@ import org.apache.openejb.core.stateful.
 import org.apache.openejb.core.stateless.StatelessContainer;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.ContainerSystem;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.ejb.common.util.EjbDefinitionUtility;
 import org.apache.webbeans.ejb.common.util.EjbUtility;
@@ -59,7 +60,6 @@ import org.apache.webbeans.ejb.service.O
 import org.apache.webbeans.ejb.service.OpenEJBTransactionService;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.spi.SecurityService;
 import org.apache.webbeans.spi.TransactionService;
 import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
@@ -379,7 +379,7 @@ public class EjbPlugin extends AbstractO
         for (DeploymentInfo deployment : deployments)
         {
             boolean inTest = Boolean.valueOf(SecurityUtil.doPrivilegedGetSystemProperty("EjbPlugin.test",
"false"));
-            classLoaderEquality = deployment.getBeanClass().getClassLoader().equals(WebBeansFinder.getSingletonClassLoader(PluginLoader.getInstance()));
+            classLoaderEquality = deployment.getBeanClass().getClassLoader().equals(WebBeansFinder.getSingletonClassLoader(WebBeansContext.getInstance().getPluginLoader()));
 
             // Yes, this EJB archive is deployed within this web
             // application

Modified: openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
(original)
+++ openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
Sat Dec  4 04:27:19 2010
@@ -35,9 +35,9 @@ import javax.xml.ws.WebServiceRef;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.persistence.JtaEntityManager;
 import org.apache.openejb.persistence.JtaEntityManagerRegistry;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.ejb.EjbPlugin;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.spi.api.ResourceReference;
 
 
@@ -108,7 +108,7 @@ class ResourceInjectionProcessor
             }            
             else
             {
-                EjbPlugin plugin =(EjbPlugin) PluginLoader.getInstance().getEjbPlugin();
+                EjbPlugin plugin =(EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                 return plugin.getEjbInstance(intf, resourceReference.getResourceType());
               
             }
         }

Modified: openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java
(original)
+++ openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/EjbTestContext.java
Sat Dec  4 04:27:19 2010
@@ -19,10 +19,8 @@
 package org.apache.webbeans.ejb;
 
 import org.apache.openejb.OpenEJB;
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.ejb.component.OpenEjbBean;
-import org.apache.webbeans.plugins.PluginLoader;
-import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.generics.GProcessAnnotatedType;
 
 public abstract class EjbTestContext
@@ -30,7 +28,7 @@ public abstract class EjbTestContext
     
     protected EjbTestContext(String name)
     {
-        BeanManagerImpl.getManager();
+        WebBeansContext.getInstance().getBeanManagerImpl();
     }
  
     
@@ -38,7 +36,7 @@ public abstract class EjbTestContext
     {
         try
         {
-            PluginLoader.getInstance().startUp();
+            WebBeansContext.getInstance().getPluginLoader().startUp();
             
             System.out.println("INIT EJB");
             
@@ -69,7 +67,7 @@ public abstract class EjbTestContext
     protected <T> OpenEjbBean<T> defineEjbBean(Class<T> ejbClass)
     {
         EjbPlugin plugin = new EjbPlugin();
-       return (OpenEjbBean<T>)plugin.defineSessionBean(ejbClass, 
-               new GProcessAnnotatedType(AnnotatedElementFactory.getInstance().newAnnotatedType(ejbClass)));
+        return (OpenEjbBean<T>)plugin.defineSessionBean(ejbClass,
+               new GProcessAnnotatedType(WebBeansContext.getInstance().getAnnotatedElementFactory().newAnnotatedType(ejbClass)));
     }
 }

Modified: openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBeanTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBeanTest.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBeanTest.java
(original)
+++ openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBeanTest.java
Sat Dec  4 04:27:19 2010
@@ -20,10 +20,10 @@ package org.apache.webbeans.ejb.bean;
 
 import junit.framework.Assert;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.ejb.EjbPlugin;
 import org.apache.webbeans.ejb.EjbTestContext;
 import org.apache.webbeans.ejb.component.OpenEjbBean;
-import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.generics.GProcessAnnotatedType;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -56,8 +56,8 @@ public class SimpleBeanTest extends EjbT
         boolean value = plugin.isSessionBean(SimpleBean.class);
         
         Assert.assertTrue(value);
-        
-        GProcessAnnotatedType annotatedType = new GProcessAnnotatedType(AnnotatedElementFactory.getInstance().newAnnotatedType(SimpleBean.class));
+
+        GProcessAnnotatedType annotatedType = new GProcessAnnotatedType(WebBeansContext.getInstance().getAnnotatedElementFactory().newAnnotatedType(SimpleBean.class));
         
         OpenEjbBean<SimpleBean> bean = (OpenEjbBean<SimpleBean>)plugin.defineSessionBean(SimpleBean.class,
annotatedType);
         Assert.assertNotNull(bean);

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Sat Dec  4 04:27:19 2010
@@ -45,11 +45,10 @@ import org.apache.openejb.jee.EjbJar;
 import org.apache.openejb.jee.SingletonBean;
 import org.apache.openejb.jee.StatefulBean;
 import org.apache.openejb.jee.StatelessBean;
-import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.ejb.EjbPlugin;
 import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
-import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.spi.ScannerService;
 import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
 import org.jboss.testharness.api.DeploymentException;
@@ -115,8 +114,8 @@ public class StandaloneContainersImpl im
                     super.beforeStartApplication(object);
                     try
                     {
-                        PluginLoader.getInstance().startUp();
-                        EjbPlugin plugin = (EjbPlugin) PluginLoader.getInstance().getEjbPlugin();
+                        WebBeansContext.getInstance().getPluginLoader().startUp();
+                        EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                         plugin.setUseInTest(true);
                     }
                     catch (Throwable e)
@@ -171,7 +170,7 @@ public class StandaloneContainersImpl im
 
             try
             {
-                EjbPlugin plugin = (EjbPlugin) PluginLoader.getInstance().getEjbPlugin();
+                EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                 plugin.setUseInTest(false);
             }
             catch (Throwable e)
@@ -192,7 +191,7 @@ public class StandaloneContainersImpl im
 
     protected BeanManager getBeanManager()
     {
-        return BeanManagerImpl.getManager();
+        return WebBeansContext.getInstance().getBeanManagerImpl();
     }
 
     @Override
@@ -236,7 +235,7 @@ public class StandaloneContainersImpl im
 
             try
             {
-                EjbPlugin plugin = (EjbPlugin) PluginLoader.getInstance().getEjbPlugin();
+                EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                 plugin.setUseInTest(true);
             }
             catch (Throwable e)

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
Sat Dec  4 04:27:19 2010
@@ -21,6 +21,7 @@ package org.apache.webbeans.servlet;
 import org.apache.webbeans.component.InjectionPointBean;
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.el.ELContextStore;
@@ -203,7 +204,7 @@ public class WebBeansConfigurationListen
         }
         this.lifeCycle.getContextService().endContext(SessionScoped.class, event.getSession());
 
-        ConversationManager conversationManager = ConversationManager.getInstance();
+        ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
         conversationManager.destroyConversationContextWithSessionId(event.getSession().getId());
     }
 

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
Sat Dec  4 04:27:19 2010
@@ -19,7 +19,7 @@
 package org.apache.webbeans.web.context;
 
 import org.apache.webbeans.config.OWBLogConst;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.AbstractContextsService;
 import org.apache.webbeans.context.ApplicationContext;
 import org.apache.webbeans.context.ConversationContext;
@@ -86,8 +86,8 @@ public class WebContextsService extends 
     private final SessionContextManager sessionCtxManager = SessionContextManager.getInstance();
 
     /**Conversation context manager*/
-    private final ConversationManager conversationManager = ConversationManager.getInstance();
-    
+    private final ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
+
     private boolean supportsConversation = false;
     
     protected FailOverService failoverService = null;
@@ -124,7 +124,7 @@ public class WebContextsService extends 
      */
     public WebContextsService()
     {
-        supportsConversation =  OpenWebBeansConfiguration.getInstance().supportsConversation();
+        supportsConversation =  WebBeansContext.getInstance().getOpenWebBeansConfiguration().supportsConversation();
         failoverService = (FailOverService) ServiceLoader.getService(FailOverService.class);
 
     }

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
Sat Dec  4 04:27:19 2010
@@ -34,7 +34,7 @@ import javassist.util.proxy.ProxyObjectO
 import javax.enterprise.inject.spi.Bean;
 import javax.servlet.http.HttpSession;
 
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.spi.FailOverService;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -71,14 +71,14 @@ public class DefaultOwbFailOverService i
     public DefaultOwbFailOverService () 
     {
         String value;
-        value = OpenWebBeansConfiguration.getInstance().
+        value = WebBeansContext.getInstance().getOpenWebBeansConfiguration().
             getProperty(OWB_FAILOVER_IS_SUPPORT_FAILOVER);
         if (value != null && value.equalsIgnoreCase("true"))
         {
             isSupportFailOver = true;
         }
-        
-        value = OpenWebBeansConfiguration.getInstance().
+
+        value = WebBeansContext.getInstance().getOpenWebBeansConfiguration().
         getProperty(OWB_FAILOVER_IS_SUPPORT_PASSIVATE);
         if (value != null && value.equalsIgnoreCase("true"))
         {
@@ -87,7 +87,7 @@ public class DefaultOwbFailOverService i
         if (isSupportFailOver || isSupportPassivation)
         {
             WebBeansUtil.initProxyFactoryClassLoaderProvider();
-            value = OpenWebBeansConfiguration.getInstance().getProperty(OWB_FAILOVER_RESOURCSES_SERIALIZATION_HANDLER);
+            value = WebBeansContext.getInstance().getOpenWebBeansConfiguration().getProperty(OWB_FAILOVER_RESOURCSES_SERIALIZATION_HANDLER);
             try 
             {
                 if (value != null) 

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java?rev=1042099&r1=1042098&r2=1042099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBag.java
Sat Dec  4 04:27:19 2010
@@ -31,6 +31,7 @@ import javassist.util.proxy.ProxyObjectO
 import javax.enterprise.context.Conversation;
 import javax.servlet.http.HttpSession;
 
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.context.SessionContext;
 import org.apache.webbeans.conversation.ConversationManager;
@@ -75,7 +76,7 @@ public class FailOverBag implements Seri
         sessionContext = sessionManager.getSessionContextWithSessionId(session.getId());
 
         // get all conversation contexts 
-        ConversationManager conversationManager = ConversationManager.getInstance();
+        ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
         conversationContextMap = conversationManager.getConversationMapWithSessionId(session.getId());
     }
     
@@ -91,7 +92,7 @@ public class FailOverBag implements Seri
             }
             if (conversationContextMap != null && !conversationContextMap.isEmpty())
             {
-                ConversationManager conversationManager = ConversationManager.getInstance();
+                ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager();
                 java.util.Iterator<Conversation> it = conversationContextMap.keySet().iterator();
                 while(it.hasNext()) 
                 {

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=1042099&r1=1042098&r2=1042099&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
Sat Dec  4 04:27:19 2010
@@ -21,7 +21,7 @@ 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.conversation.ConversationManager;
+import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.lifecycle.AbstractLifeCycle;
@@ -92,7 +92,7 @@ public final class WebContainerLifecycle
      */
     protected void afterStartApplication(Object startupObject) throws Exception
     {
-        String strDelay = OpenWebBeansConfiguration.getInstance().getProperty(OpenWebBeansConfiguration.CONVERSATION_PERIODIC_DELAY,"150000");
+        String strDelay = WebBeansContext.getInstance().getOpenWebBeansConfiguration().getProperty(OpenWebBeansConfiguration.CONVERSATION_PERIODIC_DELAY,"150000");
         long delay = Long.parseLong(strDelay);
 
         service = Executors.newScheduledThreadPool(1);
@@ -101,7 +101,7 @@ public final class WebContainerLifecycle
         ELAdaptor elAdaptor = ServiceLoader.getService(ELAdaptor.class);
         ELResolver resolver = elAdaptor.getOwbELResolver();
         //Application is configured as JSP
-        if(OpenWebBeansConfiguration.getInstance().isJspApplication())
+        if(WebBeansContext.getInstance().getOpenWebBeansConfiguration().isJspApplication())
         {
             logger.debug("Application is configured as JSP. Adding EL Resolver.");
             
@@ -222,7 +222,7 @@ public final class WebContainerLifecycle
 
         public void run()
         {
-            ConversationManager.getInstance().destroyWithRespectToTimout();
+            WebBeansContext.getInstance().getConversationManager().destroyWithRespectToTimout();
 
         }
     }



Mime
View raw message