You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/07/04 08:23:50 UTC

svn commit: r791064 - in /incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf: WebBeansJSFFilter.java WebBeansPhaseListener.java

Author: gerdogdu
Date: Sat Jul  4 06:23:49 2009
New Revision: 791064

URL: http://svn.apache.org/viewvc?rev=791064&view=rev
Log:
Reflecting some class names changes in webbeans-impl.

Modified:
    incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
    incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java

Modified: incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java?rev=791064&r1=791063&r2=791064&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java (original)
+++ incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java Sat Jul  4 06:23:49 2009
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.apache.webbeans.annotation.CurrentLiteral;
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.util.JSFUtil;
 
 public class WebBeansJSFFilter implements Filter
@@ -53,8 +53,8 @@
             @Override
             public void sendRedirect(String location) throws IOException
             {
-                Bean<?> bean = ManagerImpl.getManager().resolveByType(Conversation.class, new CurrentLiteral()).iterator().next();
-                Conversation conversation = (Conversation)ManagerImpl.getManager().getInstance(bean);
+                Bean<?> bean = BeanManagerImpl.getManager().resolveByType(Conversation.class, new CurrentLiteral()).iterator().next();
+                Conversation conversation = (Conversation)BeanManagerImpl.getManager().getInstance(bean);
 
                 String path = location;
 

Modified: incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=791064&r1=791063&r2=791064&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java (original)
+++ incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java Sat Jul  4 06:23:49 2009
@@ -19,7 +19,7 @@
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 
-import org.apache.webbeans.container.ManagerImpl;
+import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.ContextFactory;
 import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.conversation.ConversationImpl;
@@ -114,7 +114,7 @@
 
         else if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
         {
-            ConversationContext context = (ConversationContext) ManagerImpl.getManager().getContext(ConversationScoped.class);
+            ConversationContext context = (ConversationContext) BeanManagerImpl.getManager().getContext(ConversationScoped.class);
 
             // if long running, saves it
             if (conversation.isLongRunning())
@@ -157,7 +157,7 @@
 
         else if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
         {
-            ConversationContext context = (ConversationContext) ManagerImpl.getManager().getContext(ConversationScoped.class);
+            ConversationContext context = (ConversationContext) BeanManagerImpl.getManager().getContext(ConversationScoped.class);
 
             if (!JSFUtil.isPostBack())
             {