svn commit: r576896 - in /myfaces/orchestra/trunk: core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java pom.xml

[im...@apache.org]

Author: imario
Date: Tue Sep 18 06:15:53 2007
New Revision: 576896

URL: http://svn.apache.org/viewvc?rev=576896&view=rev
Log:
moved to released artifacts
fixed regression with flash scope

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
    myfaces/orchestra/trunk/pom.xml

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java?rev=576896&r1=576895&r2=576896&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java Tue Sep 18 06:15:53 2007
@@ -57,7 +57,7 @@
  * </bean>
  * </pre>
  * <p>
- * 
+ *
  * <h2>Conversation properties</h2>
  * The following properties can be defined on a scope and then apply to any conversation that is created
  * to hold a bean of this scope:
@@ -66,10 +66,10 @@
  * <li>timeout: a time period (in minutes) after which inactive conversations are terminated.
  * If not specified, then inactive conversations are never automatically terminated.</li>
  * </ul>
- * 
+ *
  * <h2>Other Notes</h2>
  * If the bean definition does not specify a conversation name, then the bean name is used
- * as the conversation name. 
+ * as the conversation name.
  * <p>
  * As shown above, a list of AOP Advices can be specified for the scope, in which case each of the
  * advices gets configured for any bean declared with this scope.
@@ -78,7 +78,7 @@
 {
 	public static final String LIFETIME_FLASH = "flash";
 	public static final String LIFETIME_MANUAL = "manual";
-	
+
 	private Integer timeout;
 	private String lifetime = "manual";
 
@@ -92,20 +92,20 @@
 
 	/**
 	 * The timeout in minutes when the conversation will end.
-	 * See {@link ConversationTimeoutableAspect#timeout} for the default timeout. 
+	 * See {@link ConversationTimeoutableAspect#timeout} for the default timeout.
 	 */
 	public void setTimeout(Integer timeout)
 	{
 		this.timeout = timeout;
 	}
 
-	public String getLifetime() 
+	public String getLifetime()
 	{
 		return lifetime;
 	}
 
 	/**
-	 * Must be one of "flash" or "manual". 
+	 * Must be one of "flash" or "manual".
 	 * <p>
 	 * Defaults to "manual".
 	 */
@@ -162,6 +162,17 @@
 		{
 			ConversationAspect aspect = new ConversationFlashLifetimeAspect(conversation);
 			conversation.addAspect(aspect);
+		}
+	}
+
+	protected void notifyAccessConversation(Conversation conversation)
+	{
+		super.notifyAccessConversation(conversation);
+
+		ConversationFlashLifetimeAspect aspect = (ConversationFlashLifetimeAspect) conversation.getAspect(ConversationFlashLifetimeAspect.class);
+		if (aspect != null)
+		{
+			aspect.markAsAccessed();
 		}
 	}
 }

Modified: myfaces/orchestra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/pom.xml?rev=576896&r1=576895&r2=576896&view=diff
==============================================================================
--- myfaces/orchestra/trunk/pom.xml (original)
+++ myfaces/orchestra/trunk/pom.xml Tue Sep 18 06:15:53 2007
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.apache.myfaces.maven</groupId>
 		<artifactId>myfaces-master</artifactId>
-		<version>1.0.6-SNAPSHOT</version>
+		<version>1.0.6</version>
 	</parent>
 
 	<groupId>org.apache.myfaces.orchestra</groupId>
@@ -219,7 +219,7 @@
 		<!-- ensure to not to point to a snapshot version during release -->
 		<myfaces.version>1.2.0</myfaces.version>
 		<tomahawk.version>1.1.6</tomahawk.version>
-		<myfaces-orchestra-shared.version>2.0.6-SNAPSHOT</myfaces-orchestra-shared.version>
+		<myfaces-orchestra-shared.version>2.0.7</myfaces-orchestra-shared.version>
 	</properties>
 
 </project>