You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/01/02 06:00:47 UTC
svn commit: r1054348 - in /myfaces/extensions/cdi/trunk:
examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/
jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cd...
Author: gpetracek
Date: Sun Jan 2 05:00:47 2011
New Revision: 1054348
URL: http://svn.apache.org/viewvc?rev=1054348&view=rev
Log:
EXTCDI-116 first draft
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageObserver.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/JsfModuleConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java?rev=1054348&r1=1054347&r2=1054348&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/conversation/grouped/ConversationDemoBean1.java Sun Jan 2 05:00:47 2011
@@ -25,6 +25,9 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
import org.apache.myfaces.examples.codi.jsf12.view.DemoPages;
+import org.apache.myfaces.extensions.cdi.jsf.api.Jsf;
+import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
+
import static org.apache.myfaces.examples.codi.jsf12.conversation.grouped.qualifier.QualifierInstances.qualifier3;
import javax.inject.Named;
@@ -61,6 +64,10 @@ public class ConversationDemoBean1 imple
@Inject
private Logger.Factory loggerFactory;
+ @Inject
+ @Jsf
+ private MessageContext messageContext;
+
@PostConstruct
public void init()
{
@@ -73,6 +80,9 @@ public class ConversationDemoBean1 imple
public String next()
{
+ this.messageContext.message()
+ .text("message preserved over a redirect")
+ .add();
return DemoPages.HelloMyFacesCodi1.class.getName();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/JsfModuleConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/JsfModuleConfig.java?rev=1054348&r1=1054347&r2=1054348&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/JsfModuleConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/JsfModuleConfig.java Sun Jan 2 05:00:47 2011
@@ -66,4 +66,9 @@ public class JsfModuleConfig extends Abs
{
return true;
}
+
+ public boolean isAlwaysKeepMessages()
+ {
+ return true;
+ }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java?rev=1054348&r1=1054347&r2=1054348&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextWrapper.java Sun Jan 2 05:00:47 2011
@@ -19,9 +19,11 @@
package org.apache.myfaces.extensions.cdi.jsf.impl.listener.request;
import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.impl.util.ClassDeactivation;
import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.RedirectedConversationAwareExternalContext;
+import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
import javax.el.ELContext;
import javax.faces.application.Application;
@@ -33,6 +35,8 @@ import javax.faces.context.ResponseStrea
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKit;
import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* @author Gerhard Petracek
@@ -47,6 +51,8 @@ class CodiFacesContextWrapper extends Fa
private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
+ private WindowContext windowContext;
+
CodiFacesContextWrapper(FacesContext wrappedFacesContext)
{
this.wrappedFacesContext = wrappedFacesContext;
@@ -102,6 +108,33 @@ class CodiFacesContextWrapper extends Fa
return this.wrappedExternalContext;
}
+ public void addMessage(String componentId, FacesMessage facesMessage)
+ {
+ this.wrappedFacesContext.addMessage(componentId, facesMessage);
+
+ if(this.windowContext == null)
+ {
+ this.windowContext = ConversationUtils.getWindowContextManager().getCurrentWindowContext();
+ }
+
+ if(this.windowContext == null)
+ {
+ return;
+ }
+
+ @SuppressWarnings({"unchecked"})
+ List<FacesMessageEntry> facesMessageEntryList =
+ this.windowContext.getAttribute(FacesMessage.class.getName(), List.class);
+
+ if(facesMessageEntryList == null)
+ {
+ facesMessageEntryList = new CopyOnWriteArrayList<FacesMessageEntry>();
+ this.windowContext.setAttribute(FacesMessage.class.getName(), facesMessageEntryList);
+ }
+
+ facesMessageEntryList.add(new FacesMessageEntry(componentId, facesMessage));
+ }
+
@Override
public ELContext getELContext()
{
@@ -173,12 +206,6 @@ class CodiFacesContextWrapper extends Fa
wrappedFacesContext.setViewRoot(uiViewRoot);
}
- public void addMessage(String s, FacesMessage facesMessage)
- {
- //TODO
- wrappedFacesContext.addMessage(s, facesMessage);
- }
-
public void renderResponse()
{
wrappedFacesContext.renderResponse();
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java?rev=1054348&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java Sun Jan 2 05:00:47 2011
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.jsf.impl.listener.request;
+
+import javax.enterprise.inject.Typed;
+import javax.faces.application.FacesMessage;
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class FacesMessageEntry implements Serializable
+{
+ private static final long serialVersionUID = 6831499672107426470L;
+ private String componentId;
+ private FacesMessage facesMessage;
+
+ protected FacesMessageEntry()
+ {
+ }
+
+ public FacesMessageEntry(String componentId, FacesMessage facesMessage)
+ {
+ this.componentId = componentId;
+ this.facesMessage = facesMessage;
+ }
+
+ public String getComponentId()
+ {
+ return componentId;
+ }
+
+ public FacesMessage getFacesMessage()
+ {
+ return facesMessage;
+ }
+}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageObserver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageObserver.java?rev=1054348&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageObserver.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageObserver.java Sun Jan 2 05:00:47 2011
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.jsf.impl.listener.request;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.JsfModuleConfig;
+import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.JsfLifecyclePhaseInformation;
+import org.apache.myfaces.extensions.cdi.jsf.api.listener.request.AfterFacesRequest;
+import org.apache.myfaces.extensions.cdi.jsf.api.listener.request.BeforeFacesRequest;
+
+import javax.enterprise.event.Observes;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import java.util.List;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class FacesMessageObserver
+{
+ @Inject
+ private JsfLifecyclePhaseInformation lifecyclePhaseInformation;
+
+ @Inject
+ private WindowContext windowContext;
+
+ private boolean alwaysKeepMessages;
+
+ protected FacesMessageObserver()
+ {
+ }
+
+ @Inject
+ protected FacesMessageObserver(JsfModuleConfig jsfModuleConfig)
+ {
+ this.alwaysKeepMessages = jsfModuleConfig.isAlwaysKeepMessages();
+ }
+
+ protected void restoreFacesMessages(@Observes @BeforeFacesRequest FacesContext facesContext)
+ {
+ if(!this.alwaysKeepMessages)
+ {
+ return;
+ }
+
+ @SuppressWarnings({"unchecked"})
+ List<FacesMessageEntry> facesMessageEntryList =
+ this.windowContext.getAttribute(FacesMessage.class.getName(), List.class);
+
+ if(facesMessageEntryList != null)
+ {
+ for(FacesMessageEntry facesMessageEntry : facesMessageEntryList)
+ {
+ facesContext.addMessage(facesMessageEntry.getComponentId(), facesMessageEntry.getFacesMessage());
+ facesMessageEntryList.remove(facesMessageEntry);
+ }
+ facesMessageEntryList.clear();
+ }
+ }
+
+ protected void saveFacesMessages(@Observes @AfterFacesRequest FacesContext facesContext)
+ {
+ if(this.lifecyclePhaseInformation.isRenderResponsePhase() || !this.alwaysKeepMessages)
+ {
+ @SuppressWarnings({"unchecked"})
+ List<FacesMessageEntry> facesMessageEntryList =
+ this.windowContext.getAttribute(FacesMessage.class.getName(), List.class);
+
+ if(facesMessageEntryList != null)
+ {
+ facesMessageEntryList.clear();
+ }
+ }
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java?rev=1054348&r1=1054347&r2=1054348&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextWrapper.java Sun Jan 2 05:00:47 2011
@@ -19,15 +19,21 @@
package org.apache.myfaces.extensions.cdi.jsf2.impl.listener.request;
import org.apache.myfaces.extensions.cdi.core.api.config.CodiCoreConfig;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.impl.util.ClassDeactivation;
import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.listener.request.BeforeAfterFacesRequestBroadcaster;
+import org.apache.myfaces.extensions.cdi.jsf.impl.listener.request.FacesMessageEntry;
+import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
import org.apache.myfaces.extensions.cdi.jsf2.impl.scope.conversation.RedirectedConversationAwareExternalContext;
+import javax.faces.application.FacesMessage;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextWrapper;
import javax.faces.application.Application;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* @author Gerhard Petracek
@@ -42,6 +48,8 @@ class CodiFacesContextWrapper extends Fa
private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
+ private WindowContext windowContext;
+
CodiFacesContextWrapper(FacesContext wrappedFacesContext)
{
this.wrappedFacesContext = wrappedFacesContext;
@@ -104,6 +112,34 @@ class CodiFacesContextWrapper extends Fa
return this.wrappedExternalContext;
}
+ @Override
+ public void addMessage(String componentId, FacesMessage facesMessage)
+ {
+ this.wrappedFacesContext.addMessage(componentId, facesMessage);
+
+ if(this.windowContext == null)
+ {
+ this.windowContext = ConversationUtils.getWindowContextManager().getCurrentWindowContext();
+ }
+
+ if(this.windowContext == null)
+ {
+ return;
+ }
+
+ @SuppressWarnings({"unchecked"})
+ List<FacesMessageEntry> facesMessageEntryList =
+ this.windowContext.getAttribute(FacesMessage.class.getName(), List.class);
+
+ if(facesMessageEntryList == null)
+ {
+ facesMessageEntryList = new CopyOnWriteArrayList<FacesMessageEntry>();
+ this.windowContext.setAttribute(FacesMessage.class.getName(), facesMessageEntryList);
+ }
+
+ facesMessageEntryList.add(new FacesMessageEntry(componentId, facesMessage));
+ }
+
public FacesContext getWrapped()
{
return this.wrappedFacesContext;