openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
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 GMT
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<Conversation>
 {
@@ -31,7 +32,10 @@
     @Override
     protected Conversation createInstance(CreationalContext<Conversation> 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.



Mime
View raw message