svn commit: r944800 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/reference/recognized-annotations/Action.html

[bu...@apache.org]

Author: buildbot
Date: Mon Mar 23 21:22:52 2015
New Revision: 944800

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/reference/recognized-annotations/Action.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 23 21:22:52 2015
@@ -1 +1 @@
-1668738
+1668741

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar 23 21:22:52 2015
@@ -1 +1 @@
-1668738
+1668741

Modified: websites/staging/isis/trunk/content/reference/recognized-annotations/Action.html
==============================================================================
--- websites/staging/isis/trunk/content/reference/recognized-annotations/Action.html (original)
+++ websites/staging/isis/trunk/content/reference/recognized-annotations/Action.html Mon Mar 23 21:22:52 2015
@@ -772,10 +772,6 @@ rather than an error.</p>
 <p>Normally events are only raised for interactions through the UI.  However, events can be raised programmatically by
 wrapping the target object using the <a href="../services/wrapper-factory.html">Wrapper Factory</a> service.</p>
 
-<h4>See also</h4>
-
-<p>Domain events can also be raised for <a href="./Property.html">properties</a> and <a href="./Collection.html">collections</a>.</p>
-
 <h2>Hidden</h2>
 
 <p>Actions can be hidden at the domain-level, indicating that they are not visible to the end-user.  For example:</p>
@@ -856,7 +852,7 @@ defer the execution of the action and ha
 
 <p>By default, actions are invoked in directly in the thread of the invocation.</p>
 
-<p>If the <code>CommandContext</code> service is configured, then this action invocation is reified into a <code>Command</code> object,
+<p>Each action invocation is reified by the <code>CommandContext</code> service into a <code>Command</code> object,
 capturing details of the target object, the action, the parameter arguments, the user, a timestamp and so on.</p>
 
 <p>If an appropriate <code>CommandService</code> service is configured (for example the
@@ -867,7 +863,7 @@ the <code>Command</code> itself is persi
 
 <h3><code>command()</code></h3>
 
-<p>The <code>command()</code> attribute determines whether the action invocation should be reified into a <code>Command</code> object.</p>
+<p>The <code>command()</code> attribute determines whether the action invocation should be reified into a <code>Command</code> object (by the <code>CommandContext</code> service).</p>
 
 <p>The default is <code>AS_CONFIGURED</code>, meaning that the configuration property:</p>
 
@@ -888,19 +884,6 @@ the <code>Command</code> itself is persi
 
 <pre><code>public class Order {
 
-    @Action(
-        command=CommandReification.ENABLED,
-        commandExecuteIn=CommandExecuteIn.FOREGROUND,
-        commandPersistence=CommandPersistence.PERSISTED)
-    public Invoice generateInvoice(...) { ... }
-
-}
-</code></pre>
-
-<p>or alternatively just:</p>
-
-<pre><code>public class Order {
-
     @Action(command=CommandReification.ENABLED)
     public Invoice generateInvoice(...) { ... }