From weld-commits at lists.jboss.org Mon Nov  9 20:49:00 2009
Content-Type: multipart/mixed; boundary="===============2467182062098580328=="
MIME-Version: 1.0
From: weld-commits at lists.jboss.org
To: weld-commits at lists.jboss.org
Subject: [weld-commits] Weld SVN:  r4923 - doc/trunk/reference/en-US.
Date: Mon, 09 Nov 2009 20:49:00 -0500
Message-ID: <200911100149.nAA1n00c000861@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: gavin.king(a)jboss.com
Date: 2009-11-09 20:49:00 -0500 (Mon, 09 Nov 2009)
New Revision: 4923

Modified:
   doc/trunk/reference/en-US/scopescontexts.xml
Log:
various revisions

Modified: doc/trunk/reference/en-US/scopescontexts.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
--- doc/trunk/reference/en-US/scopescontexts.xml	2009-11-10 01:48:46 UTC (r=
ev 4922)
+++ doc/trunk/reference/en-US/scopescontexts.xml	2009-11-10 01:49:00 UTC (r=
ev 4923)
@@ -33,8 +33,7 @@
 =

    <note>
       <para>
-         There's actually no way to remove a bean from a context explicitl=
y. It turns out that's a good thing because
-         there is no confusion as to which instance you are getting.
+         There's actually no way to remove a bean from a context until the=
 entire context is destroyed.
       </para>
    </note>
 =

@@ -103,7 +102,7 @@
       </itemizedlist>
 =

       <note>
-         <para>A CDI extension can support the conversation for other fram=
eworks as well.</para>
+         <para>A CDI extension can support the conversation scope for othe=
r frameworks as well.</para>
       </note>
 =

       <para>The request and application scopes are also active:</para>
@@ -151,7 +150,7 @@
          <listitem>
             <para>
                holds state associated with a particular web browser tab in=
 a JSF application (browsers tend to share
-               domain cookies, and hence the session cookie, between tabs,=
 which is the root of the issue).
+               domain cookies, and hence the session cookie, between tabs,=
 so this is not the case for the session scope).
             </para>
          </listitem>
       </itemizedlist>
@@ -221,14 +220,15 @@
             This bean is able to control its own lifecycle through use of =
the <literal>Conversation</literal> API. But
             some other beans have a lifecycle which depends completely upo=
n another object.
          </para>
+         =

       </section>
   =

       <section>
          <title>Conversation propagation</title>
     =

          <para>
-            The conversation context automatically propagates with any JSF=
 faces request (JSF form submission). It does
-            not automatically propagate with non-faces requests, for examp=
le, navigation via a link.
+            The conversation context automatically propagates with any JSF=
 faces request (JSF form submission) or redirect. =

+            It does  not automatically propagate with non-faces requests, =
for example, navigation via a link.
          </para>
     =

          <para>
@@ -245,19 +245,20 @@
          <programlisting role=3D"HTML"><![CDATA[<a href=3D"/addProduct.jsp=
?cid=3D#{conversation.id}">Add Product</a>]]></programlisting>
 =

          <para>
-            Though it's probably better to use one of the link components =
in JSF 2:
+            It's probably better to use one of the link components in JSF =
2:
          </para>
 =

          <programlisting role=3D"HTML"><![CDATA[<h:link outcome=3D"/addPro=
duct.xhtml value=3D"Add Product">
    <f:param name=3D"cid" value=3D"#{conversation.id}"/>
 </h:link>]]></programlisting>
-
+         =

+         <tip>
          <para>
-            The container is also required to propagate conversations acro=
ss any redirect, even if the conversation is
-            not marked long-running. This makes it very easy to implement =
the common POST-then-redirect pattern, without
-            resort to fragile constructs such as a "flash" object. In this=
 case, the container automatically adds a
-            request parameter to the redirect URL.
+            The conversation context propagates across redirects, making i=
t very easy to implement the common =

+            POST-then-redirect pattern, without resort to fragile construc=
ts such as a "flash" object. The container =

+            automatically adds the conversation id to the redirect URL as =
a request parameter.
          </para>
+         </tip>
 =

       </section>
   =

@@ -266,8 +267,8 @@
     =

          <para>
             The container is permitted to destroy a conversation and all s=
tate held in its context at any time in order
-            to preserve resources. A CDI implementation will normally do t=
his on the basis of some kind of timeout
-            &#8212; though this is not required by the CDI specification. =
The timeout is the period of inactivity before
+            to conserve resources. A CDI implementation will normally do t=
his on the basis of some kind of =

+            timeout&#8212;though this is not required by the specification=
. The timeout is the period of inactivity before
             the conversation is destroyed (as opposed to the amount of tim=
e the conversation is active).
          </para>
     =

@@ -286,8 +287,8 @@
       <title>The dependent pseudo-scope</title>
 =

       <para>
-         In addition to the four built-in scopes, CDI features the so-call=
ed <emphasis>dependent
-         pseudo-scope</emphasis>. This is the default scope for a bean whi=
ch does not explicitly declare a scope type.
+         In addition to the four built-in scopes, CDI features the so-call=
ed <emphasis>dependent pseudo-scope</emphasis>. =

+         This is the default scope for a bean which does not explicitly de=
clare a scope type.
       </para>
 =

       <para>
@@ -297,15 +298,10 @@
       <programlisting role=3D"JAVA"><![CDATA[public class Calculator { ...=
 }]]></programlisting>
 =

       <para>
-         When an injection point of a bean resolves to a dependent bean, a=
 new instance of the dependent bean is created
-         when the bean into which it's being injected is instantiated. Ins=
tances of dependent beans are never shared
-         between different beans or different injection points. They are s=
trictly <emphasis>dependent objects</emphasis>
-         of some other bean instance.
+         An instances of a dependent bean is never shared between differen=
t clients or different injection points. It is =

+         strictly a <emphasis>dependent object</emphasis> of some other ob=
ject. It is instantiated when the object it =

+         belongs to is created, and destroyed when the object it belongs t=
o is destroyed.
       </para>
-  =

-      <para>
-         Dependent bean instances are destroyed when the instance they dep=
end upon is destroyed.
-      </para>
 =

       <para>
          CDI makes it easy to obtain a dependent instance of a bean, even =
if the bean is already declared as a bean with
@@ -313,7 +309,7 @@
       </para>
 =

       <section>
-         <title>The <literal>@New</literal> annotation</title>
+         <title>The <literal>@New</literal> qualifier</title>
 =

          <para>
             The built-in <literal>@New</literal> qualifier annotation allo=
ws <emphasis>implicit</emphasis> definition of


--===============2467182062098580328==--