svn commit: r582406 - /myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml

[sk...@apache.org]

Author: skitching
Date: Fri Oct  5 14:44:02 2007
New Revision: 582406

URL: http://svn.apache.org/viewvc?rev=582406&view=rev
Log:
Minor tweaks.

Modified:
    myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml

Modified: myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml?rev=582406&r1=582405&r2=582406&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml (original)
+++ myfaces/orchestra/trunk/core/src/site/xdoc/usage.xml Fri Oct  5 14:44:02 2007
@@ -50,7 +50,7 @@
 				<code><pre>
 &lt;bean name="userInfo"
     class="my.app.pck.backings.UserInfo"
-    scope="conversation"
+    scope="conversation.flash"
     autowire="byName"&gt;
     &lt;aop:scoped-proxy /&gt;
 &lt;/bean&gt;
@@ -58,8 +58,8 @@
 				<p>
 					We've learned about this syntax in the small example in the introduction - a short repetition:
 					<br/>
-					First, the scope-attribute of the bean-element will be defining the name of the scope -
-					usually "conversation".
+					First, the scope-attribute of the bean-element will be defining the name of the scope; the 
+					names can be whatever you like but we recommend "conversation.flash" and "conversation.manual".
 					<br/>
 					Second, it is very important to use the
 					<b>
@@ -93,14 +93,14 @@
 				<code><pre>
 &lt;bean name="bean1"
     class="my.app.pck.backings.bean1"
-    scope="conversation"
+    scope="conversation.manual"
     orchestra:conversationName="multibean"
 	autowire="byName"&gt;
     &lt;aop:scoped-proxy /&gt;
 &lt;/bean&gt;
 &lt;bean name="bean2"
 	class="my.app.pck.backings.bean2"
-	scope="conversation"
+	scope="conversation.manual"
 	orchestra:conversationName="multibean"
 	autowire="byName"&gt;
 	&lt;aop:scoped-proxy /&gt;
@@ -116,8 +116,10 @@
 
 			<subsection name="Closing a conversation">
 			<p>
-				Closing a conversation is straightforward as well.
-				All that needs to be done is to call:
+				Closing a conversation is straightforward as well. If the bean is in a scope
+				that has been marked with lifetime=flash then the conversation terminates 
+				when a request is processed without referring to anything in that conversation.
+				If you've using a "manual" conversation instead, then you need to call:
 				<pre>
 	<code>Conversation.getCurrentInstance().invalidate()</code>
 				</pre>
@@ -236,8 +238,8 @@
 
 						<li>valueUnbound()<br/>
 							Will be invoked AFTER the bean has been removed from the conversation map.<br/>
-							This will haben if you call <code>removeAttribute(key)</code> or if the
-							conversation ends, either manually or autmoatically due to a timeout.
+							This will happen if you call <code>removeAttribute(key)</code> or if the
+							conversation ends, either manually or automatically due to a timeout.
 						</li>
 					</ul>