Author: pete.muir(a)jboss.org Date: 2008-01-25 12:52:46 -0500 (Fri, 25 Jan 2008) New Revision: 7239 Modified: branches/Seam_2_0/doc/reference/en/modules/annotations.xml Log: backport r7238 (JBSEAM-2536) Modified: branches/Seam_2_0/doc/reference/en/modules/annotations.xml =================================================================== --- branches/Seam_2_0/doc/reference/en/modules/annotations.xml 2008-01-25 17:45:31 UTC (rev 7238) +++ branches/Seam_2_0/doc/reference/en/modules/annotations.xml 2008-01-25 17:52:46 UTC (rev 7239) @@ -733,8 +733,10 @@ default behavior of a session bean component. ie. method invocations should take place in a transaction, and if no transaction exists when the method is called, a transaction will be started just for that method. This annotation may be applied at either class or method level. - <emphasis>Do not use this annotations on EJB 3.0 components, use <literal>@TransactionAttribute</literal>!</emphasis> </para> + <para> + <emphasis>Do not use this annotation on EJB 3.0 components, use <literal>@TransactionAttribute</literal>!</emphasis> + </para> </listitem> </varlistentry> <varlistentry> @@ -742,10 +744,36 @@ <literal>@ApplicationException</literal> </term> <listitem> - <programlisting><![CDATA[@Transactional]]></programlisting> + <programlisting><![CDATA[@ApplicationException]]></programlisting> <para> - TDB + Synonym for javax.ejb.ApplicationException, for use in a + pre Java EE 5 environment. Applied to an exception to + denote that it is an application exception and should be + reported to the client directly(i.e., unwrapped). </para> + <para> + <emphasis>Do not use this + annotation on EJB 3.0 components, use + <literal&gt;(a)javax.ejb.ApplicationException&lt;/literal&gt; instead</emphasis>. + </para> + <itemizedlist> + <listitem> + <para> + <literal>rollback</literal> &#8212; by default + <literal>false</literal>, if <literal>true</literal> + this exception should set the transaction to + rollback only + </para> + </listitem> + <listitem> + <para> + <literal>end</literal> &#8212; by default + <literal>false</literal>, if <literal>true</literal> + this exception should end the current + long-running conversation + </para> + </listitem> + </itemizedlist> </listitem> </varlistentry> <varlistentry> @@ -753,17 +781,25 @@ <literal>@Interceptors</literal> </term> <listitem> - <programlisting><![CDATA[@Transactional]]></programlisting> + <programlisting><![CDATA[@Interceptors({DVDInterceptor, CDInterceptor})]]></programlisting> <para> - TDB + Synonym for javax.interceptors.Interceptors, for use in + a pre Java EE 5 environment. Note that this may only be + used as a meta-annotation. Declares an ordered list of + interceptors for a class or method. </para> + <para> + <emphasis>Do not use this + annotations on EJB 3.0 components, use + <literal&gt;(a)javax.interceptor.Interceptors&lt;/literal&gt; instead</emphasis>. + </para> </listitem> </varlistentry> </variablelist> <para> These annotations are mostly useful for JavaBean Seam components. If you use EJB 3.0 components, you - should use the standard <literal>@TransactionAttribute</literal> annotation. + should use the standard Java EE5 annotation. </para> </section>