Author: buildbot
Date: Wed Nov 19 09:39:17 2014
New Revision: 929753

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/components/objectstores/jdo/services/auditing-service-jdo.html
    
websites/staging/isis/trunk/content/components/objectstores/jdo/services/background-command-service-jdo.html
    
websites/staging/isis/trunk/content/components/objectstores/jdo/services/command-service-jdo.html
    
websites/staging/isis/trunk/content/components/objectstores/jdo/services/publishing-service-jdo.html
    websites/staging/isis/trunk/content/intro/tutorials/apacheconeu-2014.html
    websites/staging/isis/trunk/content/reference/services/ClockService.html
    websites/staging/isis/trunk/content/reference/services/auditing-service.html
    websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
    
websites/staging/isis/trunk/content/reference/services/event-bus-service.html
    
websites/staging/isis/trunk/content/reference/services/query-results-cache.html
    websites/staging/isis/trunk/content/reference/services/scratchpad.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Nov 19 09:39:17 2014
@@ -1 +1 @@
-1640504
+1640512

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Nov 19 09:39:17 2014
@@ -1 +1 @@
-1640504
+1640512

Modified: 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/auditing-service-jdo.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/auditing-service-jdo.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/auditing-service-jdo.html
 Wed Nov 19 09:39:17 2014
@@ -421,25 +421,7 @@
 </h1>
 </div>
 
-<p><div class="note">
-In 1.6.0 this implementation was released as 
<em>org.apache.isis.core:isis-module-audit-jdo:1.6.0</em> and was also released 
as an <a href="http://github.com/isisaddons/isis-module-audit";>Isis addon</a> 
module.  <strong>In 1.7.0+ only the <a 
href="http://github.com/isisaddons/isis-module-audit";>Isis addon</a> 
implementation is released.</strong></div></p>
-
-<p>The JDO objectstore provides a simple implementation of the applib <a 
href="../../../../reference/services/auditing-service.html">AuditingService</a> 
that simply persists the event data into a <code>AuditEntryJdo</code> entity.  
This is mapped to an <code>IsisAuditEntry</code> table.</p>
-
-<blockquote>
-  <p>Rather than using an <code>AuditingService</code>, you may prefer to use 
the <a href="../../../../reference/services/publishing-service.html">Publishing 
Service</a>, since it is considerably more flexible.  A JDO <a 
href="./publishing-service-jdo.html">implementation</a> is available.</p>
-</blockquote>
-
-<h3>Register the Service</h3>
-
-<p>Register like any other service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdo,\
-              ...
-</code></pre>
-
-<p>Assuming that you've also configured Isis to use the JDO objectstore, you 
should be good to go...</p>
+<p>For 1.7.0+, see the <a 
href="http://github.com/isisaddons/isis-module-audit";>Isis addon</a> module.</p>
 
 
 

Modified: 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/background-command-service-jdo.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/background-command-service-jdo.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/background-command-service-jdo.html
 Wed Nov 19 09:39:17 2014
@@ -421,42 +421,7 @@
 </h1>
 </div>
 
-<p><div class="note">
-In 1.6.0 this implementation was released as part of 
<em>org.apache.isis.core:isis-module-command-jdo:1.6.0</em> and was also 
released as an <a href="http://github.com/isisaddons/isis-module-command";>Isis 
addon</a> module.  <strong>In 1.7.0+ only the <a 
href="http://github.com/isisaddons/isis-module-command";>Isis addon</a> 
implementation is released.</strong></div></p>
-
-<p>The JDO objectstore provides an implementation of the applib <a 
href="../../../../reference/services/background-service.html">BackgroundCommandService</a>
 that persists the command data into a <code>CommandJdo</code> entity.  This is 
mapped to an <code>IsisCommand</code> table.</p>
-
-<p>There are two further services that can be used:</p>
-
-<ul>
-<li>the <code>BackgroundCommandServiceJdoRepository</code> service provides a 
set of finders to query <code>Command</code>s.  </li>
-<li>the <code>BackgroundCommandServiceJdoContributions</code> service defines 
a number of contributed collections into the user interface for any persisted 
<code>Command</code>s.  These have the effect of showing the child background 
<code>Command</code>s for a parent <code>Command</code> (usually 
foreground).</li>
-</ul>
-
-<h3>Executing the <code>Command</code>s</h3>
-
-<p>The <code>BackgroundCommandServiceJdo</code> only persists the 
<code>Command</code>s to a database table, it doesn't actually execute those 
commands.  For this, you can use  <a 
href="../non-ui/background-command-execution-jdo.html">BackgroundCommandExecutionFromBackgroundCommandServiceJdo</a>
 class, a subclass implementation of <a 
href="../../../../reference/non-ui/background-command-execution.html">BackgroundCommandExecution</a>.
  The intention is that this class is instantiated regularly (eg every 10 
seconds) by a scheduler such as <a href="http://quartz.org";>Quartz</a>) to poll 
for <code>Command</code>s to be executed, and then execute them.  As you might 
imagine, to find new <code>Ccommand</code>s it uses the 
<code>BackgroundCommandServiceJdoRepository</code>. </p>
-
-<p>An example of how to configure the Quartz scheduler can be found on the 
page that describes the applib <a 
href="../../../../reference/services/background-service.html">BackgroundService</a>.</p>
-
-<h3>Related services</h3>
-
-<p>This service is intended to be deployed in conjunction with the <a 
href="./command-service-jdo.html">JDO implementation</a> of the applib <a 
href="../../../../reference/services/command-context.html">CommandService</a>, 
which provides the ability to persist "foreground" <code>Command</code>s also 
as <code>CommandJdo</code>s (and to the same <code>IsisCommand</code> table.</p>
-
-<p><em>Note</em> the <code>BackgroundCommandServiceJdoRepository</code> 
queries for any <code>Command</code>s that needs to be executed (has not yet 
started).  Typically these will be those created explicitly through the 
<code>BackgroundService</code> API.  However, <code>Command</code>s to be 
executed in the background can also be created implicitly through the 
<code>@Command(executeIn=BACKGROUND)</code> annotation, whereby the 
<code>CommandContext</code> service delegates to the configured 
<code>CommandService</code> to persist the <code>Command</code>.  For these to 
be picked up, the <code>CommandService</code> in use should be the JDO 
implementation.</p>
-
-<p>Put another way: just make sure you use the JDO implementations of 
<code>CommandService</code> and <code>BackgroundCommandService</code> 
together.</p>
-
-<h3>Register the Service(s)</h3>
-
-<p>Register like any other service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdo,\
-              
org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoRepository,\
-              
org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoContributions,\
-              ...
-</code></pre>
+<p>For 1.7.0+, please see the <a 
href="http://github.com/isisaddons/isis-module-command";>Isis addon</a> 
module.</p>
 
 
 

Modified: 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/command-service-jdo.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/command-service-jdo.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/command-service-jdo.html
 Wed Nov 19 09:39:17 2014
@@ -421,43 +421,7 @@
 </h1>
 </div>
 
-<p><div class="note">
-In 1.6.0 this implementation was released as 
<em>org.apache.isis.core:isis-module-command-jdo:1.6.0</em> and was also 
released as an <a href="http://github.com/isisaddons/isis-module-command";>Isis 
addon</a> module.  <strong>In 1.7.0+ only the <a 
href="http://github.com/isisaddons/isis-module-command";>Isis addon</a> 
implementation is released.</strong></div></p>
-
-<p>The JDO objectstore provides an implementation of the applib <a 
href="../../../../reference/services/command-context.html">CommandService</a> 
that persists the command data into a <code>CommandJdo</code> entity.  This is 
mapped to an <code>IsisCommand</code> table.</p>
-
-<p>This supports a number of use cases:</p>
-
-<ul>
-<li>by making action interactions persistent as <code>Command</code>s, it 
enables profiling of actions (eg identify slow actions, or simply to identify 
the most commonly used transactions)</li>
-<li>it allows foreground <code>Command</code>s to be associated with any 
background child <code>Command</code>s created through the applib <a 
href="../../../../reference/services/background-service.html">BackgroundService</a>.</li>
-<li>if <a 
href="../../../../reference/services/auditing-service.html">auditing</a> is 
configured (for example, the <a href="./auditing-service-jdo.html">JDO 
implementation</a>), they provide better audit information as the 
<code>Command</code> (the 'cause' of an action) can be correlated to the audit 
records (the "effect" of the action) through the unique 
<code>transactionId</code> GUID</li>
-<li>if <a 
href="../../../../reference/services/publishing-service.html">publishing</a> is 
configured (for example the <a href="./publishing-service-jdo.html">JDO 
implementation</a>), they provide better traceability as the 
<code>Command</code> is also correlated with any published events, again 
through the unique <code>transactionId</code> GUID</li>
-</ul>
-
-<p>There are a further repository that can also be used:</p>
-
-<ul>
-<li>the <code>CommandServiceJdoRepository</code> service provides a set of 
finders to query <code>Command</code>s.  </li>
-</ul>
-
-<p>Note that this service does <em>not</em> provide any infrastructure for 
executing background <code>Command</code>s (actions annotated with 
<code>@Command(executeIn=BACKGROUND)</code>).  To execute these, configure the 
<a href="./background-command-service-jdo.html">JDO implementation</a> of the 
applib <a 
href="../../../../reference/services/background-service.html">BackgroundCommandService</a>.</p>
-
-<h3>Related services</h3>
-
-<p>This service is intended to be deployed in conjunction with the <a 
href="./background-command-service-jdo.html">JDO implementation</a> of the 
applib <a 
href="../../../../reference/services/background-service.html">BackgroundCommandService</a>,
 which provides the ability to persist "foreground" <code>Command</code>s also 
as <code>CommandJdo</code>s (and to the same <code>IsisCommand</code> table.</p>
-
-<h3>Register the Service(s)</h3>
-
-<p>Register like any other service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdo,\
-              
org.apache.isis.objectstore.jdo.applib.service.command.CommandServiceJdoRepository,\
-              ...
-</code></pre>
-
-<p>Assuming that you've also configured Isis to use the JDO objectstore, you 
should be good to go...</p>
+<p>For 1.7.0+, please see the <a 
href="http://github.com/isisaddons/isis-module-command";>Isis addon</a> 
module.</p>
 
 
 

Modified: 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/publishing-service-jdo.html
==============================================================================
--- 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/publishing-service-jdo.html
 (original)
+++ 
websites/staging/isis/trunk/content/components/objectstores/jdo/services/publishing-service-jdo.html
 Wed Nov 19 09:39:17 2014
@@ -421,41 +421,7 @@
 </h1>
 </div>
 
-<p><div class="note">
-In 1.6.0 this implementation was released as part of 
<em>org.apache.isis.core:isis-module-publishing-jdo:1.6.0</em> and was also 
released as an <a 
href="http://github.com/isisaddons/isis-module-publishing";>Isis addon</a> 
module.  <strong>In 1.7.0+ only the <a 
href="http://github.com/isisaddons/isis-module-publishing";>Isis addon</a> 
implementation is released.</strong></div></p>
-
-<p>The JDO objectstore provides a simple implementation of the applib <a 
href="../../../../reference/services/publishing-service.html">PublishingService</a>
 that simply persists the event data into a <code>PublishedEvent</code> 
entity.</p>
-
-<p>Along with the event data, the <code>PublishedEvent</code> also includes a 
status property with two values: <code>QUEUED</code> and 
<code>PROCESSED</code>.  The service also acts as a repository to search for 
all unprocessed events.</p>
-
-<p>The intention is for an event service bus (eg <a 
href="http://servicemix.apache.org";>Apache ServiceMix</a>) to poll for 
unprocessed events, either directly to the database, or using the Restful 
Objects API.  Once processed, then the status can be updated.</p>
-
-<p>Although a polling architecture introduces some overhead, it avoids the 
complexity of XA/JTA transactions which would otherwise be needed to ensure 
that events are only published atomically with committed changes to the 
database.</p>
-
-<h2>Configuration (v1.5.0 onwards)</h2>
-
-<p>The <code>PublishedEvent</code> entity can either persist the serialized 
form of the event as a zipped byte array or as a CLOB.  Which is used is 
determined by a configuration setting (typically stored in 
<code>persistor_datanucleus.properties</code>, but <code>isis.properties</code> 
can also be used):</p>
-
-<pre><code># whether to persist the event data as a "clob" or as a "zipped" 
byte[]
-isis.persistor.datanucleus.PublishingService.serializedForm=clob
-</code></pre>
-
-<p>If not specified, then "zipped" is the default.</p>
-
-<h2>Register the Service</h2>
-
-<p>Register like any other service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.applib.service.publish.PublishingServiceJdo,\
-              ...
-</code></pre>
-
-<p>Assuming that you've also configured Isis to use the JDO objectstore, you 
should be good to go...</p>
-
-<h2>Related projects</h2>
-
-<p>Dan Haywood's <a 
href="https://github.com/danhaywood/camel-isis-pubsubjdo";>camel-isis-pubsubjdo</a>
 project up on github shows how to poll and process the persisted 
<code>PublishedEvent</code> table using <a 
href="http://camel.apache.org";>Apache Camel</a>.</p>
+<p>For 1.7.0+, please see the <a 
href="http://github.com/isisaddons/isis-module-command";>Isis addon</a> 
module.</p>
 
 
 

Modified: 
websites/staging/isis/trunk/content/intro/tutorials/apacheconeu-2014.html
==============================================================================
--- websites/staging/isis/trunk/content/intro/tutorials/apacheconeu-2014.html 
(original)
+++ websites/staging/isis/trunk/content/intro/tutorials/apacheconeu-2014.html 
Wed Nov 19 09:39:17 2014
@@ -956,20 +956,22 @@ mvn clean install
 
 <p>By default the events generated are 
<code>ActionInteractionEvent.Default</code> (for actions) and 
<code>PropertyInteractionEvent.Default</code> (for properties).  Subclasses of 
these can be specified using the <a 
href="http://isis.apache.org/reference/recognized-annotations/ActionInteraction.html";>@ActionInteraction</a>
 or <a 
href="http://isis.apache.org/reference/recognized-annotations/PropertyInteraction.html";>@PropertyInteraction</a>.</p>
 
-<p>Using the guidance in <a href="">these docs</a>: </p>
+<p>Using the guidance in <a 
href="http://isis.apache.org/reference/services/event-bus-service.html";>these 
docs</a>: </p>
 
 <ul>
-<li>write a domain service subscriber to </li>
+<li>write a domain service subscriber to subscribe to events</li>
+<li>use the domain service to perform log events</li>
+<li>use the domain service to veto actions (hide/disable or validate)</li>
+<li>Bulk actions</li>
 </ul>
 
-<p>TODO</p>
+<p>Bulk actions are actions that can be invoked on a collection of actions, 
that is on collections returned by invoking an action.  Actions are specified 
as being bulk actions using the <a 
href="http://isis.apache.org/reference/recognized-annotations/Bulk.html";>@Bulk</a>
 annotation.  Note that currently (1.8.0-SNAPSHOT) only no-arg actions can be 
specified as bulk actions.</p>
 
 <ul>
-<li>Bulk actions</li>
+<li>Write a no-arg action for your domain entity </li>
+<li>Inject the <a 
href="http://isis.apache.org/reference/services/bulk-interaction.html";>Bulk.InteractionContext</a>
 service and use this to </li>
 </ul>
 
-<p>TODO</p>
-
 <h2>Performance tuning</h2>
 
 <p>TODO</p>
@@ -1031,6 +1033,8 @@ mvn clean install
 
 <p>TODO</p>
 
+<h2>Exception Recognizers</h2>
+
 <h2>Configuring to use an external database</h2>
 
 <p>TODO</p>

Modified: 
websites/staging/isis/trunk/content/reference/services/ClockService.html
==============================================================================
--- websites/staging/isis/trunk/content/reference/services/ClockService.html 
(original)
+++ websites/staging/isis/trunk/content/reference/services/ClockService.html 
Wed Nov 19 09:39:17 2014
@@ -450,12 +450,7 @@
 
 <h2>Registering the Service</h2>
 
-<p>Register like any other service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              org.apache.isis.applib.services.clock.ClockService,\
-              ...
-</code></pre>
+<p>The <code>ClockService</code> class is automatically registered (it is 
annotated with <code>@DomainService</code>) so no further configuration is 
required.</p>
 
 <h2>Alternative Implementations</h2>
 
@@ -477,7 +472,14 @@
 }
 </code></pre>
 
-<p>You can then register this service - instead of the default 
<code>ClockService</code> - in the usual way within 
<code>isis.properties</code></p>
+<p>You can then register this service in the usual way within 
<code>isis.properties</code>:</p>
+
+<pre><code>isis.services=...,\
+              com.mycompany.myapp.NntpClockService,\
+              ...
+</code></pre>
+
+<p>Because this is a subclass of <code>ClockService</code> it will be used 
instead of the default implementation.</p>
 
 
 

Modified: 
websites/staging/isis/trunk/content/reference/services/auditing-service.html
==============================================================================
--- 
websites/staging/isis/trunk/content/reference/services/auditing-service.html 
(original)
+++ 
websites/staging/isis/trunk/content/reference/services/auditing-service.html 
Wed Nov 19 09:39:17 2014
@@ -463,13 +463,9 @@
 
 <h2>Implementations</h2>
 
-<p>A simple implementation of the service that writes to stderr, is available, 
useful for debugging:</p>
+<p>For 1.7.0+, please see the <a 
href="http://github.com/isisaddons/isis-module-audit";>Isis addon audit</a> 
module.</p>
 
-<ul>
-<li><code>org.apache.isis.applib.services.audit.AuditingService3$Stderr</code></li>
-</ul>
-
-<p>An alternative implementation, that persists audit records to a database, 
is the <a 
href="../../components/objectstores/jdo/services/publishing-service-jdo.html">JDO
 Publishing Service</a>.   This implementation is only supported when the the 
<a href="../../components/objectstores/jdo/about.html">JDO objectstore</a> is 
configured.</p>
+<p>If you just want to debug (writing to stderr), you can instead configure 
<code>org.apache.isis.applib.services.audit.AuditingService3$Stderr</code></p>
 
 <h2>Usage</h2>
 
@@ -505,12 +501,7 @@ public class NotAuditedObject { ... }
 
 <h2>Register the Service</h2>
 
-<p>Register like any other service in <code>isis.properties</code>.  For 
example, if using the <a 
href="../../components/objectstores/jdo/services/auditing-service-jdo.html">JDO 
auditing implementation</a> then it would be:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.applib.service.audit.AuditingServiceJdo,\
-              ...
-</code></pre>
+<p>See the <a href="http://github.com/isisaddons/isis-module-audit";>Isis addon 
audit</a> module for details.</p>
 
 <h3>Related Services</h3>
 

Modified: 
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html
==============================================================================
--- 
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html 
(original)
+++ 
websites/staging/isis/trunk/content/reference/services/bulk-interaction.html 
Wed Nov 19 09:39:17 2014
@@ -480,13 +480,7 @@ public ToDoItem completed() {
 
 <h3>Registering the Service</h3>
 
-<p>The <code>Bulk.InteractionContext</code> is a concrete class, so can be 
registered directly
-as a service in <code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              org.apache.isis.applib.annotation.Bulk.InteractionContext,\
-              ...
-</code></pre>
+<p>The <code>Bulk.InteractionContext</code> class is automatically registered 
(it is annotated with <code>@DomainService</code>) so no further configuration 
is required.</p>
 
 <h3>Unit testing support</h3>
 

Modified: 
websites/staging/isis/trunk/content/reference/services/event-bus-service.html
==============================================================================
--- 
websites/staging/isis/trunk/content/reference/services/event-bus-service.html 
(original)
+++ 
websites/staging/isis/trunk/content/reference/services/event-bus-service.html 
Wed Nov 19 09:39:17 2014
@@ -529,7 +529,7 @@ public class MySubscribingDomainService 
 }
 </code></pre>
 
-<h3><code>@PostsPropertyChangedEvent</code></h3>
+<h3><code>@PostsPropertyChangedEvent</code> (deprecated)</h3>
 
 <p>Isis will also automatically publish (post) an 
<code>org.apache.isis.applib.services.eventbus.PropertyChangedEvent</code> 
event object on any property that is annotated with <a 
href="../recognized-annotations/PostsPropertyChangedEvent.html">`@PostsPropertyChangedEvent</a>.
  This can remove some boilerplate.</p>
 
@@ -545,33 +545,11 @@ public class MySubscribingDomainService 
 
 <h2>Implementation</h2>
 
-<p>Isis provides two implementations.  The default implementation (provided by 
core runtime) is:</p>
-
-<pre><code>org.apache.isis.core.runtime.services.eventbus.EventBusServiceDefault
-</code></pre>
-
-<p>However, if the JDO objectstore is in use, then its implementation 
<em>must</em> be used instead:</p>
-
-<pre><code>org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo
-</code></pre>
+<p>Isis provides the 
<code>org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo</code>
 as a default implementation of the <code>EventBusService</code> API.</p>
 
 <h2>Register the Service</h2>
 
-<p>Register this service like any other service, in 
<code>isis.properties</code></p>
-
-<p>If the JDO Objectstore is <em>not</em> in use, use:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.core.runtime.services.eventbus.EventBusServiceDefault,\
-              ...
-</code></pre>
-
-<p>If the JDO ObjectStore <em>is</em> in use, use:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,\
-              ...
-</code></pre>
+<p>The <code>EventBusServiceJdo</code> class is automatically registered (it 
is annotated with <code>@DomainService</code>) so no further configuration is 
required.</p>
 
 <h2>Related Services</h2>
 

Modified: 
websites/staging/isis/trunk/content/reference/services/query-results-cache.html
==============================================================================
--- 
websites/staging/isis/trunk/content/reference/services/query-results-cache.html 
(original)
+++ 
websites/staging/isis/trunk/content/reference/services/query-results-cache.html 
Wed Nov 19 09:39:17 2014
@@ -518,12 +518,7 @@ public class QueryResultsCache {
 
 <h3>Register the Service</h3>
 
-<p>Register this service like any other service, in 
<code>isis.properties</code>, eg:</p>
-
-<pre><code>isis.services=...,\
-              
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,\
-              ...
-</code></pre>
+<p>The <code>QueryResultsCache</code> class is automatically registered (it is 
annotated with <code>@DomainService</code>) so no further configuration is 
required.</p>
 
 <h3>Related Services</h3>
 

Modified: websites/staging/isis/trunk/content/reference/services/scratchpad.html
==============================================================================
--- websites/staging/isis/trunk/content/reference/services/scratchpad.html 
(original)
+++ websites/staging/isis/trunk/content/reference/services/scratchpad.html Wed 
Nov 19 09:39:17 2014
@@ -506,12 +506,7 @@ public void injectScratchpad(Scratchpad 
 
 <h3>Registering the Service</h3>
 
-<p>Register the concrete implementation (from isis-core) in 
<code>isis.properties</code>:</p>
-
-<pre><code>isis.services=...,\
-              org.apache.isis.applib.services.scratchpad.Scratchpad,\
-              ...
-</code></pre>
+<p>The <code>Scratchpad</code> class is automatically registered (it is 
annotated with <code>@DomainService</code>) so no further configuration is 
required.</p>
 
 <h3>Related Services</h3>
 


Reply via email to