You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/08/30 14:54:30 UTC

svn commit: r571151 - in /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring: ConversationPolicy.java SpringFlashScope.java

Author: imario
Date: Thu Aug 30 05:54:29 2007
New Revision: 571151

URL: http://svn.apache.org/viewvc?rev=571151&view=rev
Log:
added missing aspect to the FLASH policy, created a new TIME_FLASH scope which will be used by default.

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java?rev=571151&r1=571150&r2=571151&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/ConversationPolicy.java Thu Aug 30 05:54:29 2007
@@ -19,6 +19,7 @@
 package org.apache.myfaces.orchestra.conversation.spring;
 
 import org.apache.myfaces.orchestra.conversation.ConversationTimeoutableAspect;
+import org.apache.myfaces.orchestra.conversation.ConversationFlashScopeAspect;
 
 /**
  * configuration for the scope of the conversation
@@ -47,6 +48,21 @@
 		null);
 
 	/**
+	 * a conversation with TIME_FLASH policy will end when:
+	 * <ul>
+	 * <li>leaving a page which didn't request a bean in the conversation</li>
+	 * <li>using the conversation API (e.g. {@link org.apache.myfaces.orchestra.conversation.Conversation#invalidate()}</li>
+	 * <li>reach a timeout</li>
+	 * </ul>
+	 */
+	public final static ConversationPolicy TIME_FLASH = new ConversationPolicy(
+		"FLASH",
+		new Class[]{
+			ConversationTimeoutableAspect.class,
+			ConversationFlashScopeAspect.class
+		});
+
+	/**
 	 * a conversation with FLASH policy will end when:
 	 * <ul>
 	 * <li>leaving a page which didn't request a bean in the conversation</li>
@@ -56,8 +72,7 @@
 	 */
 	public final static ConversationPolicy FLASH = new ConversationPolicy(
 		"FLASH",
-		new Class[]{ConversationTimeoutableAspect.class});
-
+		new Class[]{ConversationFlashScopeAspect.class});
 
 	private final String name;
 	private final Class[] conversationAspects;

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java?rev=571151&r1=571150&r2=571151&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringFlashScope.java Thu Aug 30 05:54:29 2007
@@ -34,7 +34,7 @@
 
 	protected ConversationPolicy getConversationPolicy()
 	{
-		return ConversationPolicy.FLASH;
+		return ConversationPolicy.TIME_FLASH;
 	}
 
 	protected void notifyAccessConversation(Conversation conversation)