[Springframework-cvs] spring/docs/reference/src transaction.xml, 1.85, 1.86 beans.xml, 1.237, 1.238

[Arjen J.W. P. <po...@us...>]

Update of /cvsroot/springframework/spring/docs/reference/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11989/docs/reference/src

Modified Files:
	transaction.xml beans.xml 
Log Message:
SPR-5130

Index: transaction.xml
===================================================================
RCS file: /cvsroot/springframework/spring/docs/reference/src/transaction.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** transaction.xml	5 May 2008 11:39:25 -0000	1.85
--- transaction.xml	14 Oct 2008 10:59:43 -0000	1.86
***************
*** 1204,1208 ****
        </para>
  
! 			<note>
          <para>The "<literal>proxy-target-class</literal>" attribute on the
          <literal>&lt;tx:annotation-driven/&gt;</literal> element controls
--- 1204,1208 ----
        </para>
  
!   	  <note>
          <para>The "<literal>proxy-target-class</literal>" attribute on the
          <literal>&lt;tx:annotation-driven/&gt;</literal> element controls
***************
*** 1216,1219 ****
--- 1216,1227 ----
          for a detailed examination of the different proxy types.)</para>
        </note>
+       <note>
+         <para>Note that <literal>&lt;tx:annotation-driven/&gt;</literal> is a only looks for
+         <interfacename>@Transactional</interfacename> on beans in the same application context it is defined in.
+         This means that, if you put <literal>&lt;tx:annotation-driven/&gt;</literal> in a
+         <interfacename>WebApplicationContext</interfacename> for a <classname>DispatcherServlet</classname>, it only
+         checks for <interfacename>@Transactional</interfacename> beans in your controllers, and not your services.
+         See <xref linkend="mvc-servlet"/> for more information.</para>
+       </note>
        <para>The most derived location takes precedence when evaluating the transactional
        settings for a method. In the case of the following example, the

Index: beans.xml
===================================================================
RCS file: /cvsroot/springframework/spring/docs/reference/src/beans.xml,v
retrieving revision 1.237
retrieving revision 1.238
diff -C2 -d -r1.237 -r1.238
*** beans.xml	13 Oct 2008 10:12:46 -0000	1.237
--- beans.xml	14 Oct 2008 10:59:43 -0000	1.238
***************
*** 5330,5333 ****
--- 5330,5342 ----
      url="http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.html"><classname>RequiredAnnotationBeanPostProcessor</classname></ulink>.)</para>
  
+     <note>
+         <para>Note that <literal>&lt;context:annotation-config/&gt;</literal> is a only looks for
+         annotations  on beans in the same application context it is defined in.
+         This means that, if you put <literal>&lt;context:annotation-config/&gt;</literal> in a
+         <interfacename>WebApplicationContext</interfacename> for a <classname>DispatcherServlet</classname>, it only
+         checks for <interfacename>@Autowired</interfacename> beans in your controllers, and not your services.
+         See <xref linkend="mvc-servlet"/> for more information.</para>
+     </note>
+ 
      <section id="beans-required-annotation">
        <title><interfacename>@Required</interfacename></title>