Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java?rev=1056145&r1=1056144&r2=1056145&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java (original) +++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java Fri Jan 7 00:54:06 2011 @@ -36,7 +36,7 @@ import javax.xml.ws.WebServiceRef; import org.apache.webbeans.component.ResourceBean; import org.apache.webbeans.config.OWBLogConst; -import org.apache.webbeans.corespi.ServiceLoader; +import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.FailOverService; @@ -57,6 +57,18 @@ public class StandaloneResourceInjection private static final WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneResourceInjectionService.class); + private final WebBeansContext webBeansContext; + + public StandaloneResourceInjectionService(WebBeansContext webBeansContext) + { + this.webBeansContext = webBeansContext; + } + + protected WebBeansContext getWebBeansContext() + { + return webBeansContext; + } + @Override public <X, T extends Annotation> X getResourceReference(ResourceReference<X, T> resourceReference) { @@ -146,7 +158,7 @@ public class StandaloneResourceInjection public <T> void writeExternal(Bean<T> bean, T actualResource, ObjectOutput out) throws IOException { // try fail over service to serialize the resource object - FailOverService failoverService = ServiceLoader.getService(FailOverService.class); + FailOverService failoverService = webBeansContext.getService(FailOverService.class); if (failoverService != null) { Object ret = failoverService.handleResource(bean, actualResource, null, out); @@ -178,7 +190,7 @@ public class StandaloneResourceInjection { T actualResource = null; // try fail over service to serialize the resource object - FailOverService failoverService = ServiceLoader.getService(FailOverService.class); + FailOverService failoverService = webBeansContext.getService(FailOverService.class); if (failoverService != null) { actualResource = (T) failoverService.handleResource(bean, actualResource, in, null);
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=1056145&r1=1056144&r2=1056145&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 Fri Jan 7 00:54:06 2011 @@ -26,8 +26,8 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import org.apache.webbeans.cditest.CdiTestContainer; +import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.context.ContextFactory; -import org.apache.webbeans.lifecycle.LifecycleFactory; import org.apache.webbeans.spi.ContainerLifecycle; import static org.apache.webbeans.util.InjectionExceptionUtils.*; @@ -46,7 +46,7 @@ public class CdiTestOpenWebBeansContaine { servletContext = new MockServletContext(); session = new MockHttpSession(); - lifecycle = LifecycleFactory.getInstance().getLifecycle(); + lifecycle = WebBeansContext.getInstance().getService(ContainerLifecycle.class); lifecycle.startApplication(servletContext); } 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=1056145&r1=1056144&r2=1056145&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 Fri Jan 7 00:54:06 2011 @@ -23,9 +23,7 @@ import org.apache.webbeans.config.OWBLog 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; -import org.apache.webbeans.lifecycle.LifecycleFactory; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.ContainerLifecycle; import org.apache.webbeans.spi.FailOverService; @@ -59,14 +57,15 @@ public class WebBeansConfigurationListen protected ContainerLifecycle lifeCycle = null; protected FailOverService failoverService = null; - + private WebBeansContext webBeansContext; + /** * Default constructor */ public WebBeansConfigurationListener() { - failoverService = (FailOverService) - ServiceLoader.getService(FailOverService.class); + webBeansContext = WebBeansContext.getInstance(); + failoverService = webBeansContext.getService(FailOverService.class); } /** @@ -74,7 +73,7 @@ public class WebBeansConfigurationListen */ public void contextInitialized(ServletContextEvent event) { - this.lifeCycle = LifecycleFactory.getInstance().getLifecycle(); + this.lifeCycle = webBeansContext.getService(ContainerLifecycle.class); try { 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=1056145&r1=1056144&r2=1056145&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 Fri Jan 7 00:54:06 2011 @@ -28,7 +28,6 @@ import org.apache.webbeans.context.Reque import org.apache.webbeans.context.SessionContext; import org.apache.webbeans.context.SingletonContext; import org.apache.webbeans.conversation.ConversationManager; -import org.apache.webbeans.corespi.ServiceLoader; import org.apache.webbeans.el.ELContextStore; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.FailOverService; @@ -86,7 +85,7 @@ public class WebContextsService extends private final SessionContextManager sessionCtxManager = SessionContextManager.getInstance(); /**Conversation context manager*/ - private final ConversationManager conversationManager = WebBeansContext.getInstance().getConversationManager(); + private final ConversationManager conversationManager; private boolean supportsConversation = false; @@ -122,11 +121,11 @@ public class WebContextsService extends /** * Creates a new instance. */ - public WebContextsService() + public WebContextsService(WebBeansContext webBeansContext) { - supportsConversation = WebBeansContext.getInstance().getOpenWebBeansConfiguration().supportsConversation(); - failoverService = (FailOverService) ServiceLoader.getService(FailOverService.class); - + supportsConversation = webBeansContext.getOpenWebBeansConfiguration().supportsConversation(); + failoverService = webBeansContext.getService(FailOverService.class); + conversationManager = webBeansContext.getConversationManager(); } /** Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java?rev=1056145&r1=1056144&r2=1056145&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java Fri Jan 7 00:54:06 2011 @@ -30,7 +30,7 @@ import java.io.ObjectOutputStream; import javax.servlet.http.HttpSession; -import org.apache.webbeans.corespi.ServiceLoader; +import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.FailOverService; @@ -55,7 +55,7 @@ public class FailOverBagWrapper implemen //do not remove, used by serialization. public FailOverBagWrapper() { - failoverService = (FailOverService)ServiceLoader.getService(FailOverService.class); + failoverService = WebBeansContext.getInstance().getService(FailOverService.class); } public FailOverBagWrapper(HttpSession session, FailOverService service) 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=1056145&r1=1056144&r2=1056145&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 Fri Jan 7 00:54:06 2011 @@ -22,7 +22,6 @@ import org.apache.webbeans.component.Inj import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.OpenWebBeansConfiguration; import org.apache.webbeans.config.WebBeansContext; -import org.apache.webbeans.corespi.ServiceLoader; import org.apache.webbeans.exception.WebBeansException; import org.apache.webbeans.lifecycle.AbstractLifeCycle; import org.apache.webbeans.logger.WebBeansLogger; @@ -98,10 +97,10 @@ public final class WebContainerLifecycle service = Executors.newScheduledThreadPool(1); service.scheduleWithFixedDelay(new ConversationCleaner(), delay, delay, TimeUnit.MILLISECONDS); - ELAdaptor elAdaptor = ServiceLoader.getService(ELAdaptor.class); + ELAdaptor elAdaptor = getWebBeansContext().getService(ELAdaptor.class); ELResolver resolver = elAdaptor.getOwbELResolver(); //Application is configured as JSP - if(WebBeansContext.getInstance().getOpenWebBeansConfiguration().isJspApplication()) + if(getWebBeansContext().getOpenWebBeansConfiguration().isJspApplication()) { logger.debug("Application is configured as JSP. Adding EL Resolver."); @@ -157,7 +156,7 @@ public final class WebContainerLifecycle } //Clear the resource injection service - ResourceInjectionService injectionServices = ServiceLoader.getService(ResourceInjectionService.class); + ResourceInjectionService injectionServices = getWebBeansContext().getService(ResourceInjectionService.class); if(injectionServices != null) { injectionServices.clear();
