[jboss-svn-commits] JBoss Common SVN: r4121 - arquillian/trunk/doc/reference/src/main/docbook/en-US.

[jboss-svn-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-03-08 08:10:22 -0500 (Mon, 08 Mar 2010)
New Revision: 4121

Modified:
   arquillian/trunk/doc/reference/src/main/docbook/en-US/enrichment.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/execution.xml
Log:
minor enhancements

Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/enrichment.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/enrichment.xml	2010-03-08 11:02:45 UTC (rev 4120)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/enrichment.xml	2010-03-08 13:10:22 UTC (rev 4121)
@@ -52,14 +52,9 @@
       </para>
 
       <para>
-         The <literal>@Resource</literal> annotation gives you access to any object which is available via JNDI. If the
-         <literal>mappedName</literal> attribute is specified, that value is used to perform a lookup in the
-         <literal>InitialContext</literal>. If, instead, the <literal>name</literal> attribute is specified, the name is
-         added to the <literal>java:comp/env/</literal> namespace prefix and passed to the
-         <literal>InitialContext</literal>. If neither the <literal>mappedName</literal> or <literal>name</literal>
-         attributes are specified, the JNDI name is constructed using the <literal>java:comp/env/</literal> prefix
-         followed by the fully qualified bean class name followed by a slash and then the name of the field. The result
-         is passed to the <literal>InitialContext</literal>.
+         The <literal>@Resource</literal> annotation gives you access to any object which is available via JNDI. It follows
+         the standard rules for <literal>@Resource</literal> (as defined in the Section 2.3 of the Common Annotations for 
+         the Java Platform specification).
       </para>
 
       <para>
@@ -78,7 +73,7 @@
       <note>
          <para>
             At the moment, the lookup for an EJB session reference relies on standard JNDI naming conventions
-            established in Java EE 6.
+            introduced in Java EE 6 - therefore you need to use a Java EE 6 container.
          </para>
       </note>
 

Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/execution.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/execution.xml	2010-03-08 11:02:45 UTC (rev 4120)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/execution.xml	2010-03-08 13:10:22 UTC (rev 4121)
@@ -7,6 +7,14 @@
    <para>
       This chapter walks through the details of test execution, covering both the remote and local container cases.
    </para>
+   
+   <note>
+      <para>
+         Whilst it's not necessary to understand the details of how Arquillian works, it is often useful to have some
+         insight. This chapter gives you an overview of how Arquillian executes your test for you in your chosen
+         container.  
+      </para>
+   </note>
 
    <section>
       <title>Anatomy of a test</title>
@@ -82,7 +90,7 @@
       </itemizedlist>
 
       <para>
-         Consult the ShrinkWrap API to discover all the options you have available for constructing the test archive.
+         Consult the <ulink url="http://docs.jboss.org/shrinkwrap/1.0.0-alpha-6/api/">ShrinkWrap API</ulink> to discover all the options you have available for constructing the test archive.
       </para>
 
    </section>