Author: denis.forveille Date: 2009-07-31 08:09:35 -0400 (Fri, 31 Jul 2009) New Revision: 11326 Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuration.xml branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversations.xml branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPropagation.java branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java branches/community/Seam_2_2/ui/src/main/config/component/button.xml branches/community/Seam_2_2/ui/src/main/config/component/conversationPropagation.xml branches/community/Seam_2_2/ui/src/main/config/component/link.xml Log: add the possibility to "end all" (root) conversation with the "s:conversationPropagation" tag JBSEAM-3752 Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuration.xml =================================================================== --- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuration.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuration.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -397,7 +397,7 @@ </sect3> </sect2> - <sect2> + <sect2 id="config.integration.ejb.container"> <title>Integrating Seam with your EJB container</title> <para> In a Seam application, EJB components have a certain duality, as they are managed by both the EJB Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml =================================================================== --- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Controls.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -75,7 +75,8 @@ <literal>propagation</literal> &#8212; determines the conversation propagation style: <literal>begin</literal>, <literal>join</literal>, <literal>nest</literal>, - <literal>none</literal> or <literal>end</literal>. + <literal>none</literal>, <literal>end</literal> + or <literal>endRoot</literal>. </para> </listitem> <listitem> @@ -189,7 +190,8 @@ <literal>propagation</literal> &#8212; determines the conversation propagation style: <literal>begin</literal>, <literal>join</literal>, <literal>nest</literal>, - <literal>none</literal> or <literal>end</literal>. + <literal>none</literal>, <literal>end</literal> + or <literal>endRoot</literal>. </para> </listitem> <listitem> @@ -230,7 +232,8 @@ <literal>type</literal> &#8212; determines the conversation propagation style: <literal>begin</literal>, <literal>join</literal>, <literal>nest</literal>, - <literal>none</literal> or <literal>end</literal>. + <literal>none</literal>, <literal>end</literal> + or <literal>endRoot</literal>. </para> </listitem> <listitem> Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversations.xml =================================================================== --- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversations.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversations.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -177,14 +177,18 @@ <para> The <literal>conversationPropagation</literal> request parameter, or the <literal>&lt;s:conversationPropagation&gt;</literal> tag may even - be used to begin and end conversation, or begin a nested - conversation. + be used to begin a conversation, end the current conversation, + destroy the entire conversation stack, or begin a nested conversation. </para> <programlisting role="XHTML"><![CDATA[<h:commandLink action="main" value="Exit"> <s:conversationPropagation type="end"/> </h:commandLink>]]></programlisting> + <programlisting role="XHTML"><![CDATA[<h:commandLink action="main" value="Exit"> + <s:conversationPropagation type="endRoot"/> +</h:commandLink>]]></programlisting> + <programlisting role="XHTML"><![CDATA[<h:commandLink action="main" value="Select Child"> <s:conversationPropagation type="nested"/> </h:commandLink>]]></programlisting> Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPropagation.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPropagation.java 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPropagation.java 2009-07-31 12:09:35 UTC (rev 11326) @@ -67,7 +67,7 @@ parentConversationId = null; validateLongRunningConversation = false; } - else if ( propagationType == PropagationType.END ) + else if (( propagationType == PropagationType.END ) || ( propagationType == PropagationType.ENDROOT )) { validateLongRunningConversation = false; } Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java 2009-07-31 12:09:35 UTC (rev 11326) @@ -571,6 +571,9 @@ case END: endConversation(false); break; + case ENDROOT: + endRootConversation(false); + break; } } Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationType.java 2009-07-31 12:09:35 UTC (rev 11326) @@ -11,5 +11,6 @@ JOIN, NEST, NONE, - END + END, + ENDROOT } Modified: branches/community/Seam_2_2/ui/src/main/config/component/button.xml =================================================================== --- branches/community/Seam_2_2/ui/src/main/config/component/button.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/ui/src/main/config/component/button.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -38,7 +38,7 @@ <property el="false"> <name>propagation</name> <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nest, none or end.</description> + <description>determines the conversation propagation style: begin, join, nest, none, end or endRoot.</description> <defaultvalue>"default"</defaultvalue> </property> <property transient="true"> Modified: branches/community/Seam_2_2/ui/src/main/config/component/conversationPropagation.xml =================================================================== --- branches/community/Seam_2_2/ui/src/main/config/component/conversationPropagation.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/ui/src/main/config/component/conversationPropagation.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -34,7 +34,7 @@ <property> <name>type</name> <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nest, none or end.</description> + <description>determines the conversation propagation style: begin, join, nest, none, end or endRoot.</description> <defaultvalue>"none"</defaultvalue> </property> </component> Modified: branches/community/Seam_2_2/ui/src/main/config/component/link.xml =================================================================== --- branches/community/Seam_2_2/ui/src/main/config/component/link.xml 2009-07-30 20:09:35 UTC (rev 11325) +++ branches/community/Seam_2_2/ui/src/main/config/component/link.xml 2009-07-31 12:09:35 UTC (rev 11326) @@ -40,7 +40,7 @@ <property> <name>propagation</name> <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nest, none or end.</description> + <description>determines the conversation propagation style: begin, join, nest, none, end or endRoot.</description> <defaultvalue>"default"</defaultvalue> </property> <!-- Should be el="false" -->