Return-Path: Delivered-To: apmail-incubator-openwebbeans-commits-archive@minotaur.apache.org Received: (qmail 30063 invoked from network); 26 Mar 2009 21:41:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Mar 2009 21:41:20 -0000 Received: (qmail 82429 invoked by uid 500); 26 Mar 2009 21:41:20 -0000 Delivered-To: apmail-incubator-openwebbeans-commits-archive@incubator.apache.org Received: (qmail 82412 invoked by uid 500); 26 Mar 2009 21:41:20 -0000 Mailing-List: contact openwebbeans-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: openwebbeans-dev@incubator.apache.org Delivered-To: mailing list openwebbeans-commits@incubator.apache.org Received: (qmail 82402 invoked by uid 99); 26 Mar 2009 21:41:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 21:41:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 21:41:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5F34B2388995; Thu, 26 Mar 2009 21:40:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758870 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ConversationComponent.java context/ContextFactory.java lifecycle/WebBeansLifeCycle.java util/WebBeansUtil.java Date: Thu, 26 Mar 2009 21:40:59 -0000 To: openwebbeans-commits@incubator.apache.org From: gerdogdu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090326214059.5F34B2388995@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gerdogdu Date: Thu Mar 26 21:40:58 2009 New Revision: 758870 URL: http://svn.apache.org/viewvc?rev=758870&view=rev Log: Conversation package changes are reflected. Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java?rev=758870&r1=758869&r2=758870&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java Thu Mar 26 21:40:58 2009 @@ -16,9 +16,10 @@ import javax.context.Conversation; import javax.context.CreationalContext; -import org.apache.webbeans.jsf.ConversationImpl; -import org.apache.webbeans.jsf.ConversationManager; -import org.apache.webbeans.util.JSFUtil; +import org.apache.webbeans.conversation.ConversationImpl; +import org.apache.webbeans.conversation.ConversationManager; +import org.apache.webbeans.spi.ServiceLoader; +import org.apache.webbeans.spi.conversation.ConversationService; public class ConversationComponent extends AbstractComponent { @@ -31,7 +32,10 @@ @Override protected Conversation createInstance(CreationalContext creationalContext) { - String conversationId = JSFUtil.getConversationId(); + ConversationService conversationService = ServiceLoader.getService(ConversationService.class); + + String conversationId = conversationService.getConversationId(); + Conversation conversation = null; if (conversationId != null) @@ -40,7 +44,7 @@ } else { - conversation = new ConversationImpl(JSFUtil.getSession().getId()); + conversation = new ConversationImpl(conversationService.getConversationSessionId()); } return conversation; Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=758870&r1=758869&r2=758870&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java Thu Mar 26 21:40:58 2009 @@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession; import org.apache.webbeans.context.type.ContextTypes; -import org.apache.webbeans.jsf.ConversationManager; +import org.apache.webbeans.conversation.ConversationManager; /** * Gets current {@link WebBeansContext} instances on the current thread context. Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java?rev=758870&r1=758869&r2=758870&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java Thu Mar 26 21:40:58 2009 @@ -33,9 +33,9 @@ import org.apache.webbeans.container.ManagerImpl; import org.apache.webbeans.container.activity.ActivityManager; import org.apache.webbeans.context.ContextFactory; +import org.apache.webbeans.conversation.ConversationManager; import org.apache.webbeans.el.WebBeansELResolver; import org.apache.webbeans.exception.WebBeansException; -import org.apache.webbeans.jsf.ConversationManager; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.spi.JNDIService; import org.apache.webbeans.spi.ServiceLoader; Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=758870&r1=758869&r2=758870&view=diff ============================================================================== --- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original) +++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Thu Mar 26 21:40:58 2009 @@ -101,6 +101,7 @@ import org.apache.webbeans.config.SimpleWebBeansConfigurator; import org.apache.webbeans.container.ManagerImpl; import org.apache.webbeans.container.activity.ActivityManager; +import org.apache.webbeans.conversation.ConversationImpl; import org.apache.webbeans.decorator.DecoratorUtil; import org.apache.webbeans.decorator.DecoratorsManager; import org.apache.webbeans.decorator.WebBeansDecoratorConfig; @@ -119,7 +120,6 @@ import org.apache.webbeans.intercept.InterceptorsManager; import org.apache.webbeans.intercept.WebBeansInterceptorConfig; import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor; -import org.apache.webbeans.jsf.ConversationImpl; /** * Contains some utility methods used in the all project.