From seam-commits at lists.jboss.org Fri Jul 31 08:09:36 2009
Content-Type: multipart/mixed; boundary="===============6882559199538286351=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11326 - in branches/community/Seam_2_2:
 src/main/org/jboss/seam/core and 1 other directories.
Date: Fri, 31 Jul 2009 08:09:36 -0400
Message-ID: <200907311209.n6VC9aVq007283@svn01.web.mwc.hst.phx2.redhat.com>

--===============6882559199538286351==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/ConversationPro=
pagation.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/conversationPro=
pagation.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:conversati=
onPropagation" tag =

JBSEAM-3752

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Config=
uration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuratio=
n.xml	2009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Configuratio=
n.xml	2009-07-31 12:09:35 UTC (rev 11326)
@@ -397,7 +397,7 @@
             </sect3>
         </sect2>
 =

-        <sect2>
+        <sect2 id=3D"config.integration.ejb.container">
             <title>Integrating Seam with your EJB container</title>
 =

             <para> In a Seam application, EJB components have a certain du=
ality, as they are managed by both the EJB

Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Contro=
ls.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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</liter=
al>, =

                      <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</liter=
al>,
                      <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 conver=
sation
                      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/Conver=
sations.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversation=
s.xml	2009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/en-US/Conversation=
s.xml	2009-07-31 12:09:35 UTC (rev 11326)
@@ -177,14 +177,18 @@
         <para>
             The <literal>conversationPropagation</literal> request paramet=
er, or =

             the <literal>&lt;s:conversationPropagation&gt;</literal> tag m=
ay 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 conve=
rsation.
         </para>
 =

         <programlisting role=3D"XHTML"><![CDATA[<h:commandLink action=3D"m=
ain" value=3D"Exit">
     <s:conversationPropagation type=3D"end"/>
 </h:commandLink>]]></programlisting>
 =

+        <programlisting role=3D"XHTML"><![CDATA[<h:commandLink action=3D"m=
ain" value=3D"Exit">
+    <s:conversationPropagation type=3D"endRoot"/>
+</h:commandLink>]]></programlisting>
+
         <programlisting role=3D"XHTML"><![CDATA[<h:commandLink action=3D"m=
ain" value=3D"Select Child">
     <s:conversationPropagation type=3D"nested"/>
 </h:commandLink>]]></programlisting>

Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/Conversa=
tionPropagation.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPr=
opagation.java	2009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/ConversationPr=
opagation.java	2009-07-31 12:09:35 UTC (rev 11326)
@@ -67,7 +67,7 @@
          parentConversationId =3D null;
          validateLongRunningConversation =3D false;
       }
-      else if ( propagationType =3D=3D PropagationType.END )
+      else if (( propagationType =3D=3D PropagationType.END ) || ( propaga=
tionType =3D=3D PropagationType.ENDROOT ))
       {
          validateLongRunningConversation =3D false;
       }

Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java	2=
009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/Manager.java	2=
009-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/Propagat=
ionType.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationTyp=
e.java	2009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/PropagationTyp=
e.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.x=
ml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/ui/src/main/config/component/button.xml	200=
9-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/ui/src/main/config/component/button.xml	200=
9-07-31 12:09:35 UTC (rev 11326)
@@ -38,7 +38,7 @@
 		<property el=3D"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=3D"true">

Modified: branches/community/Seam_2_2/ui/src/main/config/component/conversa=
tionPropagation.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/Seam_2_2/ui/src/main/config/component/conversationPr=
opagation.xml	2009-07-30 20:09:35 UTC (rev 11325)
+++ branches/community/Seam_2_2/ui/src/main/config/component/conversationPr=
opagation.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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"false" -->


--===============6882559199538286351==--