You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/04/03 23:29:16 UTC

[02/59] [abbrv] [partial] isis-site git commit: ISIS-1521: deletes content-OLDSITE

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/other/jrebel.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/other/jrebel.md b/content-OLDSITE/other/jrebel.md
deleted file mode 100644
index a45d4fe..0000000
--- a/content-OLDSITE/other/jrebel.md
+++ /dev/null
@@ -1,109 +0,0 @@
-Title: JRebel plugin (hot redeploys)
-
-[//]: # (content copied to _user-guide_xxx)
-
-The Apache Isis JRebel plugin for [JRebel](http://zeroturnaround.com/software/jrebel/) allows you to alter the domain classes in your development environment and have the running app pick up those changes (avoiding a restart).
-
-JRebel monitors the compiled bytecode of the domain object classes, and reloads whenever these are changed.  The Isis plugin then recreates the Isis and JDO metamodels automatically.
-
-This page describes how to use the JRebel with:
-
-* Maven
-* Eclipse IDE
-* IntelliJ IDE
-
-The Isis JRebel plugin itself is free for use, and is hosted on [github](https://github.com/danhaywood/isis-jrebel-plugin).  However, JRebel itself is commercial software.  There is though  a community version that is [free for open source use](https://my.jrebel.com/).   Please check terms and conditions before using.
-
-> Note that Isis must be run in prototype mode to automatically pick up changes.
-
-## Prerequisites
-
-There are two prerequisites:
-
-* first, you'll need to download the JRebel JAR (or install the plugins into the IDE) and set up a license
-* second, you'll need to build/download the Isis JRebel plugin.  Do this by cloning the [github repo](https://github.com/danhaywood/isis-jrebel-plugin), and building using maven.
-
-## DOM project configuration
-
-The `dom` module requires a `rebel.xml` file in order to tell JRebel which classes to monitor.  This file resides in `src/main/resources`, and is as follows:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
-        <classpath>
-            <dir name="${project.root}/dom/${target.dir}/classes">
-            </dir>
-        </classpath>
-    </application>
-
-Note the use of the `${project.root}` and `${target.dir}` properties; values are supplied when the application is launched (as explained below).
-
-> Prior to 1.5.0, the `rebel.xml` file simply had hard-coded values within it.
-
-## <a name="maven"><a name="screencast">Using Maven with JRebel (v1.5.0 onwards)</a></a>
-
-This screencast shows how to use Maven in conjunction with JRebel:
-
-<iframe width="640" height="360" src="//www.youtube.com/embed/jpYNZ343gi4" frameborder="0" allowfullscreen></iframe>
-
-The command used to run the webapp is:
-
-    mvn -P jrebel antrun:run \
-        -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" \
-        -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar"
-
-Change the values of `rebel.jar` and `isis_jrebel_plugin.jar` as necessary:
-
-* the `rebel.jar` property is the location of the JRebel jar file.  You can either download this or (as the above example shows) simply use the embedded JRebel from an IDE
-* the `isis_jrebel_plugin.jar` property points to the Isis plugin JAR that you built previously
-* `isis-jrebel-plugin.packagePrefix` for the prefix of the application (eg `com.mycompany.myapp.dom`)
-
-## <a name="eclipse">Using Eclipse with JRebel</a>
-
-> Remember to install the JRebel plugin for Eclipse from the Eclipse Marketplace (Help > Eclipse Marketplace), and set up a license.
-
-This screencast shows how to use Eclipse in conjunction with JRebel:
-
-<iframe width="640" height="360" src="//www.youtube.com/embed/uPfRXllQV1o" frameborder="0" allowfullscreen></iframe>
-
-The archetypes already include a `.launch` file for JRebel.  You will have to adjust some of the property values:
-
-* `rebel.plugins` for the location of the Isis plugin JAR (from the github repo)
-* `isis-jrebel-plugin.packagePrefix` for the prefix of the application (eg `com.mycompany.myapp.dom`)
-
-
-## <a name="intellij">Using IntelliJ with JRebel</a>
-
->  Remember to installed the JRebel plugin for IntelliJ (File > Settings > Plugins), and set up a license.
-
-This screencast shows how to use IntelliJ in conjunction with JRebel:
-
-<iframe width="640" height="360" src="//www.youtube.com/embed/fb5VbU-VY8I" frameborder="0" allowfullscreen></iframe>
-
-> This screencast follows on from the one that explains [how to setup IntelliJ](../../intro/getting-started/ide/intellij.html#screencast) as your IDE.
-
-The screenshot below show the Run/Debug configuration updated with appropriate VM options:
-
-<img src="images/intellij-040-run-config.png"  width="720px"/>
-
-where the VM options, in full, are:
-
-<img src="images/intellij-050-run-config-vm.png"  width="720px"/>
-
-If you want to copy-n-paste those VM options, they are:
-
-    -Drebel.log=false
-    -Drebel.check_class_hash=true
-    -Drebel.packages_exclude=org.apache.isis
-    -Dproject.root=C:\APACHE\isis-git-rw\example\application\simple_wicket_restful_jdo
-    -Dtarget.dir=target
-    -Drebel.plugins=C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar
-    -Disis-jrebel-plugin.packagePrefix=dom.simple,org.apache.isis.objectstore.jdo.applib
-    -Disis-jrebel-plugin.loggingLevel=warn
-    -XX:MaxPermSize=128m
-
-You'll need to adjust the value of some of these:
-
-* `rebel.plugins` is the location of the Isis plugin JAR (from the github repo)
-* `isis-jrebel-plugin.packagePrefix` is the prefix of the application (eg `com.mycompany.myapp.dom`)
-* `project.root` is the root directory of the application
-    

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/other/maven-plugin.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/other/maven-plugin.md b/content-OLDSITE/other/maven-plugin.md
deleted file mode 100644
index fcbec36..0000000
--- a/content-OLDSITE/other/maven-plugin.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Title: Maven Plugin
-
-[//]: # (content copied to _user-guide_xxx)
-
-{stub
-This page is a stub.
-}
-
-This is a placeholder.

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/prettify.css
----------------------------------------------------------------------
diff --git a/content-OLDSITE/prettify.css b/content-OLDSITE/prettify.css
deleted file mode 100644
index acfee4d..0000000
--- a/content-OLDSITE/prettify.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-/* SPAN elements with the classes below are added by prettyprint. */
-.pln { color: #000 }  /* plain text */
-
-@media screen {
-  .str { color: #080 }  /* string content */
-  .kwd { color: #008 }  /* a keyword */
-  .com { color: #800 }  /* a comment */
-  .typ { color: #606 }  /* a type name */
-  .lit { color: #066 }  /* a literal value */
-  /* punctuation, lisp open bracket, lisp close bracket */
-  .pun, .opn, .clo { color: #660 }
-  .tag { color: #008 }  /* a markup tag name */
-  .atn { color: #606 }  /* a markup attribute name */
-  .atv { color: #080 }  /* a markup attribute value */
-  .dec, .var { color: #606 }  /* a declaration; a variable name */
-  .fun { color: red }  /* a function name */
-}
-
-/* Use higher contrast and text-weight for printable form. */
-@media print, projection {
-  .str { color: #060 }
-  .kwd { color: #006; font-weight: bold }
-  .com { color: #600; font-style: italic }
-  .typ { color: #404; font-weight: bold }
-  .lit { color: #044 }
-  .pun, .opn, .clo { color: #440 }
-  .tag { color: #006; font-weight: bold }
-  .atn { color: #404 }
-  .atv { color: #060 }
-}
-
-/* Put a border around prettyprinted code snippets. */
-pre.prettyprint { padding: 2px; border: 1px solid #888 }
-
-/* Specify class=linenums on a pre to get line numbering */
-ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */
-li.L0,
-li.L1,
-li.L2,
-li.L3,
-li.L5,
-li.L6,
-li.L7,
-li.L8 { list-style-type: none }
-/* Alternate shading for lines */
-li.L1,
-li.L3,
-li.L5,
-li.L7,
-li.L9 { background: #eee }

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/DomainObjectContainer.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/DomainObjectContainer.md b/content-OLDSITE/reference/DomainObjectContainer.md
deleted file mode 100644
index 11934b0..0000000
--- a/content-OLDSITE/reference/DomainObjectContainer.md
+++ /dev/null
@@ -1,138 +0,0 @@
-title: DomainObjectContainer interface
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Provides a single point of contact from domain objects into the
-> *Apache Isis* framework.
-
-The `DomainObjectContainer` interface provides a single point of contact
-from domain objects into the *Isis* framework. It can also be used as a
-lightweight general purpose repository during prototyping.
-
-The following table lists the most important (ie non deprecated) methods in this interface.
-
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-    <th>Category</th>
-    <th>Method</th>
-    <th>Description</th>
-</tr>
-<tr>
-    <td>Object creation</td>
-    <td>newTransientInstance(Class&lt;T>)</td>
-    <td>Creates new non-persisted object.  
-        <p>While it is also possible to simply <i>new()</i> up an object, that object will not have any services injected into it, nor will any properties be <a href="../how-tos/how-to-03-017-How-to-specify-default-value-of-an-object-property.html">defaulted</a> nor will any <a href="./object-lifecycle-callbacks.html"><i>created()</i></a> callback be invoked.</td>
-</tr>
-<tr>
-    <td>Validation</td>
-    <td>isValid(Object)</td>
-    <td>whether object is valid</td>
-</tr>
-<tr>
-    <td></td>
-    <td>validate(Object)</td>
-    <td>reason why object is invalid (if any)</td>
-</tr>
-<tr>
-    <td>Generic Repository</td>
-    <td>allInstances(Class&lt;T>)</td>
-    <td>All persisted instances of specified type</td>
-</tr>
-<tr>
-    <td></td>
-    <td>allMatches(Class&lt;T>, Predicate&lt;T>)</td>
-    <td>All persistenced instances of specified type matching predicate</td>
-</tr>
-<tr>
-    <td></td>
-    <td>allMatches(Class&lt;T>, String)</td>
-    <td>All persisted instances with the specified string as their title</td>
-</tr>
-<tr>
-    <td></td>
-    <td>allMatches(Class&lt;T>, Object)</td>
-    <td>All persisted instances matching object (query-by-example)</td>
-</tr>
-<tr>
-    <td></td>
-    <td>allMatches(Query&lt;T>)</td>
-    <td>All instances satisfying the provided query</td>
-</tr>
-<tr>
-    <td></td>
-    <td>firstMatch(...)</td>
-    <td>As for allMatches(...), but returning first instance</td>
-</tr>
-<tr>
-    <td></td>
-    <td>uniqueMatch(...)</td>
-    <td>As for firstMatch(...), but requiring there to be only one match</td>
-</tr>
-<tr>
-    <td>Object persistence</td>
-    <td>isPersistent(Object)</td>
-    <td>whether object is persistent</td>
-</tr>
-<tr>
-    <td></td>
-    <td>persist(Object)</td>
-    <td>persist the transient object</td>
-</tr>
-<tr>
-    <td></td>
-    <td>persistIfNotAlready(Object)</td>
-    <td>persist the object (provided is not already persisted)</td>
-</tr>
-<tr>
-    <td></td>
-    <td>remove(Object)</td>
-    <td>remove the persisted object</td>
-</tr>
-<tr>
-    <td></td>
-    <td>removeIfNotAlready(Object)</td>
-    <td>remove the object (provided is not already transient)</td>
-</tr>
-<tr>
-    <td>Presentation</td>
-    <td>titleOf(Object)</td>
-    <td>Returns the title of the object.</td>
-</tr>
-<tr>
-    <td>Messages and warnings</td>
-    <td>informUser(String)</td>
-    <td>Inform the user</td>
-</tr>
-<tr>
-    <td></td>
-    <td>warnUser(String)</td>
-    <td>Warn the user about a situation, requiring acknowledgement.</td>
-</tr>
-<tr>
-    <td></td>
-    <td>raiseError(String)</td>
-    <td>Notify user of a serious application error, typically requiring further action on behalf of the user</td>
-</tr>
-<tr>
-    <td>Security</td>
-    <td>getUser()</td>
-    <td>The currently-logged on user</td>
-</tr>
-<tr>
-    <td>Properties</td>
-    <td>getProperty(String)</td>
-    <td>Value of configuration property</td>
-</tr>
-<tr>
-    <td></td>
-    <td>getPropertyNames()</td>
-    <td>All configuration properties available</td>
-</tr>
-<tr>
-    <td>Object store control</td>
-    <td>flush()</td>
-    <td>Flush all pending changes to object store</td>
-</tr>
-</table>
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/Event.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/Event.md b/content-OLDSITE/reference/Event.md
deleted file mode 100644
index 176139f..0000000
--- a/content-OLDSITE/reference/Event.md
+++ /dev/null
@@ -1,16 +0,0 @@
-title: Events
-
-[//]: # (content copied to _user-guide_xxx)
-
-> The InteractionEvent hierarchy.
-
-Although not supported by the default programming model, the applib
-nevertheless defines an event hierarchy that characterizes all of the
-different types of interactions that can occur. This is used by the
-[wrapper factory](./services/wrapper-factory.html) service, and is exploited 
-by the core [integration testing](../core/integtestsupport.html) support.
-
-The following UML class diagram shows the hierarchy of events:
-
-![](images/Events.png)
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/Recognized-Methods-and-Prefixes.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/Recognized-Methods-and-Prefixes.md b/content-OLDSITE/reference/Recognized-Methods-and-Prefixes.md
deleted file mode 100644
index 91bde4a..0000000
--- a/content-OLDSITE/reference/Recognized-Methods-and-Prefixes.md
+++ /dev/null
@@ -1,328 +0,0 @@
-title: Recognized Methods and Prefixes
-
-[//]: # (content copied to _user-guide_xxx)
-
-The following table lists all of the methods or method prefixes that are
-recognized by *Apache Isis*' default programming model:
-
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-    <th>Prefix</th>
-    <th>Object</th>
-    <th>Property</th>
-    <th>Collection</th>
-    <th>Action</th>
-    <th>Action Param</th>
-    <th>Description</th>
-</tr>
-<tr>
-    <td>addTo</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>add object to a collection (nb: not currently supported by Wicket viewer)<p>See also <tt>removeFrom</tt></td>
-</tr>
-<tr>
-    <td>autoComplete</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td>Return a list of matching elements for a <a href="../how-tos/how-to-03-015-How-to-specify-an-autocomplete-for-a-property.html">property</a> or an <a href="../how-tos/how-to-03-025-How-to-specify-an-autocomplete-for-an-action-parameter.html">action parameter</a>.  <p>Alternatively, can specify for a class using the <a href="recognized-annotations/AutoComplete.html">@AutoComplete </a> annotation.<p>See also <tt>choices</tt></td>
-</tr>
-<tr>
-    <td>cssClass</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Provides a CSS class for this object, which is added as a style in the containing &lt;tr&gt; when rendering the object within a table, or to a containing &lt;div&gt; when rendering the object on a page.  In conjunction with <i>css/application.css</i>, can therefore provide custom styling of an object instance wherever it is rendered.
-    <p>See also <tt>title</tt> and <tt>iconName</tt>.
-    </td>
-</tr>
-<tr>
-    <td>choices</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td>Provide list of choices for a <a href="../how-tos/how-to-03-010-How-to-specify-a-set-of-choices-for-a-property.html">property</a> or <a href="../how-tos/how-to-03-020-How-to-specify-a-set-of-choices-for-an-action-parameter.html">action</a> <a href="../how-tos/how-to-03-022-How-to-specify-dependent-choices-for-action-parameters.html">parameter</a><p>See also <tt>autoComplete</tt>.</td>
-</tr>
-<tr>
-    <td>clear</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Clear a property (set it to null).  Allows business logic to be placed apart from the setter.<p>See also <tt>modify</tt></td>
-</tr>
-<tr>
-    <td>created</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the object has just been <a href="./object-lifecycle-callbacks.html">created</a> using <tt>newTransientInstance()</tt></td>
-</tr>
-<tr>
-    <td>default</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td>Default value for a <a href="../how-tos/how-to-03-017-How-to-specify-default-value-of-an-object-property.html">property</a> or an <a href="../how-tos/how-to-03-050-How-to-specify-default-values-for-an-action-parameter.html">action parameter</a>.</td>
-</tr>
-<tr>
-    <td>disable</td>
-    <td>Y</td>
-    <td>Y</td>
-    <td>Y</td>
-    <td>Y</td>
-    <td></td>
-    <td>Disables (makes read-only) a <a href="../how-tos/how-to-02-050-How-to-prevent-a-property-from-being-modified.html">property</a>, a <a href="../how-tos/how-to-02-060-How-to-prevent-a-collection-from-being-modified.html">collection</a> or an <a href="../how-tos/how-to-02-070-How-to-prevent-an-action-from-being-invoked.html">action</a>.</td>
-</tr>
-<tr>
-    <td>get</td>
-    <td></td>
-    <td>Y</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Access the value of a property or collection.<p>See also <tt>set</tt>.</td>
-</tr>
-<tr>
-    <td>getId</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Provides an optional unique identifier of a service.<p>If not provided, the services fully-qualified class name is used.</td>
-</tr>
-<tr>
-    <td>hide</td>
-    <td></td>
-    <td>Y</td>
-    <td>Y</td>
-    <td>Y</td>
-    <td></td>
-    <td>Hides a <a href="../how-tos/how-to-02-010-How-to-hide-a-property.html">property</a>, a <a href="../how-tos/how-to-02-020-How-to-hide-a-collection.html">collection</a> or an <a href="../how-tos/how-to-02-030-How-to-hide-an-action.html">action</a>.</td>
-</tr>
-<tr>
-    <td>iconName</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Provides the name of the image to render, usually alongside the title, to represent the object.  If not provided, then the class name is used to locate an image.<p>See also <tt>title</tt> and <tt>cssClass</tt></td>
-</tr>
-<tr>
-    <td>loaded</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object has just been <a href="./object-lifecycle-callbacks.html">loaded</a> from the object store.<p>NB: this may not called by the JDO ObjectStore.</td>
-</tr>
-<tr>
-    <td>loading</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object is just about to be <a href="./object-lifecycle-callbacks.html">loaded</a> from the object store.<p>NB: this may not called by the JDO ObjectStore.</td>
-</tr>
-<tr>
-    <td>modify</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Modify a property (set it to a non-null) value.  Allows business logic to be placed apart from the setter.<p>See also <tt>clear</tt>.</td>
-</tr>
-<tr>
-    <td>persisted</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object has just been <a href="./object-lifecycle-callbacks.html">persisted</a> from the object store.<p>NB: this may not called by the JDO ObjectStore</td>
-</tr>
-<tr>
-    <td>persisting</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object is just about to be <a href="./object-lifecycle-callbacks.html">persisted</a> from the object store<p>NB: this may not called by the JDO ObjectStore in all situations</td>
-</tr>
-<tr>
-    <td>removeFrom</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>remove object from a collection (nb: not currently supported by Wicket viewer)<p>See also <tt>addTo</tt></td>
-</tr>
-<tr>
-    <td>removed</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object has just been <a href="./object-lifecycle-callbacks.html">persisted</a> from the object store<p>NB: this may not called by the JDO ObjectStore in all situations</td>
-</tr>
-<tr>
-    <td>removing</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object is just about to be <a href="./object-lifecycle-callbacks.html">deleted</a> from the object store<p>NB: this may not called by the JDO ObjectStore in all situations</td>
-</tr>
-<tr>
-    <td>set</td>
-    <td></td>
-    <td>Y</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Sets the value of a propery or a collection.</td>
-</tr>
-<tr>
-    <td>toString</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Used as the fallback title for an object if there is <a href="../how-tos/how-to-01-040-How-to-specify-a-title-for-a-domain-entity.html">no <tt>title()</tt> method</a> or properties annotated with the <a href="recognized-annotations/Title.html"><tt>@Title</tt> annotation.</a></td>
-</tr>
-<tr>
-    <td>title</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Provides a title for the object. <p>Alternatively, use the <a href="recognized-annotations/Title.html">@Title</a> annotation.
-     <p>See also <tt>iconName</tt> and <tt>cssClass</tt></td>
-</tr>
-<tr>
-    <td>updated</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object has just been <a href="./object-lifecycle-callbacks.html">updated</a> in the object store<p>NB: this may not called by the JDO ObjectStore in all situations</td>
-</tr>
-<tr>
-    <td>updating</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Lifecycle callback for when the (persistent) object is just about to be <a href="./object-lifecycle-callbacks.html">updated</a> in the object store<p>NB: this may not called by the JDO ObjectStore in all situations</td>
-</tr>
-<tr>
-    <td>validate</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td>Y</td>
-    <td>Y</td>
-    <td>Check that a proposed value of a <a href="../how-tos/how-to-02-100-How-to-validate-user-input-for-a-property.html">property</a> or an <a href="../how-tos/how-to-02-120-How-to-validate-an-action-parameter-argument.html">action parameter</a> is valid.<p>See also <tt>validateAddTo</tt> and <tt>validateRemoveFrom</tt> for collections.</td>
-</tr>
-<tr>
-    <td>validateAddTo</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Check that a proposed object to add to a <a href="../how-tos/how-to-02-110-How-to-validate-an-object-being-added-or-removed-from-a-collection.html">collection</a> is valid.<p>See also <tt>validateRemoveFrom</tt>, and <tt>validate</tt> for properties and collections.</td>
-</tr>
-<tr>
-    <td>validateRemoveFrom</td>
-    <td></td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Check that a proposed object to add to a <a href="../how-tos/how-to-02-110-How-to-validate-an-object-being-added-or-removed-from-a-collection.html">collection</a> is valid.<p>See also <tt>validateAddTo</tt>, and <tt>validate</tt> for properties and collections.</td>
-</tr>
-</table>
-
-
-There are also a number of deprecated methods (for lifecycle callbacks):
-
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-    <th>Prefix</th>
-    <th>Object</th>
-    <th>Property</th>
-    <th>Collection</th>
-    <th>Action</th>
-    <th>Action Param</th>
-    <th>See also</th>
-</tr>
-<tr>
-    <td>deleted</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Replaced by <tt>removed</tt></td>
-</tr>
-<tr>
-    <td>deleting</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Replaced by <tt>removing</tt></td>
-</tr>
-<tr>
-    <td>saved</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Replaced by <tt>persisted</tt></td>
-</tr>
-<tr>
-    <td>saving</td>
-    <td>Y</td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td>Replaced by <tt>persisting</tt></td>
-</tr>
-</table>
-
-In order to be recognized, all methods must be `public`. Any methods
-that do not match are deemed to be action methods that the user can
-invoke from the user interface.

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/Security.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/Security.md b/content-OLDSITE/reference/Security.md
deleted file mode 100644
index 6a0f568..0000000
--- a/content-OLDSITE/reference/Security.md
+++ /dev/null
@@ -1,38 +0,0 @@
-title: Security Classes
-
-[//]: # (content copied to _user-guide_xxx)
-
-> A simple set of classes to represent the currently logged on user and
-> their roles.
-
-When the user logs onto an *Isis* application, the framework constructs a
-representation of their user and roles using classes from the applib.
-This allows the application to inspect and act upon those details if
-required.
-
-These can be obtained from the `DomainObjectContainer`:
-
-    final UserMemento user = container.getUser();
-
-The user details are captured in the
-`org.apache.isis.applib.security.UserMemento` class ("memento" because it
-is a snapshot of their credentials at the point of logging on). 
-
-The roles of the user can be obtained in turn:
-
-    final List<RoleMemento> roles = user.getRoles();
-
-Both `UserMemento` and `RoleMemento` are defined in Isis applib.
-
-
-### `BackgroundService`s and `CommandContext`
-
-If using the [BackgroundService](./services/background-service.html), then it is possible to persist commands that will execute corresponding actions in the background (for example under the control of a scheduler).
-
-In this situation, the `user` obtained from `DomainObjectContainer` will be that of the scheduler process, which may not be what you want.
-
-However, the creator of the background `Command` (the effective user, if you like), *can* be obtained from the `CommandContext` service, using:
-
-    final String userName = commandContext.getCommand().getUser()
-
-> *Note*: At the time of writing, the roles of the effective user are not captured. 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/Utility.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/Utility.md b/content-OLDSITE/reference/Utility.md
deleted file mode 100644
index 4137c30..0000000
--- a/content-OLDSITE/reference/Utility.md
+++ /dev/null
@@ -1,64 +0,0 @@
-title: Utility Classes
-
-[//]: # (content copied to user-guide_reference_applib-utility-classes)
-
-> Simple utility classes for domain objects.
-
-The `org.apache.isis.applib.util` package has a number of simple utility
-classes designed to simplify the coding of some common tasks.
-
-## Title creation
-
-The `TitleBuffer` utility class is intended to make it easy to construct
-title strings (returned from the `title()` method). For example, it has
-overloaded versions of methods called `append()` and `concat()`.
-
-##Reason text creation (for disable and validate methods)
-
-There are two different classes provided to help build reasons returned
-by `disableXxX()` and `validateXxx()` methods:
-
--   the `org.apache.isis.applib.util.ReasonBuffer` helper class
-
--   the `org.apache.isis.applib.util.Reasons` helper class
-
-For example:
-
-    public class Customer {
-        ...
-        public String validatePlaceOrder(Product p, int quantity) {
-            return Reasons.coalesce(
-                whetherCustomerBlacklisted(this),
-                whetherProductOutOfStock(p)
-            );
-        }
-    }
-
-Which you use (if any) is up to you.
-
-##ObjectContracts
-
-The `ObjectContracts` test provides a series of methods to make it easy for your domain objects to:
-
-* implement `Comparable` (eg so can be stored in `java.util.SortedSet`s)
-* implement `toString()`
-* implement `equals()`
-* implement `hashCode()`
-
-For example:
-
-    public class ToDoItem implements Comparable<ToDoItem> {
-
-        public boolean isComplete() { ... }
-        public LocalDate getDueBy() { ... }
-        public String getDescription() { ... }
-        public String getOwnedBy() { ... }
-
-        public int compareTo(final ToDoItem other) {
-            return ObjectContracts.compare(this, other, "complete,dueBy,description");
-        }
-
-        public String toString() {
-            return ObjectContracts.toString(this, "description,complete,dueBy,ownedBy");
-        }
-    } 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/about.md b/content-OLDSITE/reference/about.md
deleted file mode 100644
index 86f0a60..0000000
--- a/content-OLDSITE/reference/about.md
+++ /dev/null
@@ -1,6 +0,0 @@
-title: Reference
-
-go back to: [documentation](../documentation.html)
-
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/configuration-files.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/configuration-files.md b/content-OLDSITE/reference/configuration-files.md
deleted file mode 100644
index 3665525..0000000
--- a/content-OLDSITE/reference/configuration-files.md
+++ /dev/null
@@ -1,81 +0,0 @@
-Title: Configuration Files
-
-[//]: # (content copied to _user-guide_xxx)
-
-Isis has one mandatory configuration file, `isis.properties`.  For the webapp viewers, this typically lives alongside the `web.xml` file in the `WEB-INF` directory.
-
-In addition, Isis will also read from a number of supplementary configuration files (if present), for each of the configured components.  For example:
-
-* if the JDO (DataNucleus) objectstore (aka persistor) is configured, then Isis will search for `persistor_datanucleus.properties`.  Isis will also read from `persistor.properties`
-* if the Shiro authentication has been configured, it will search for `authentication_shiro.properties`.  Isis will also read from `authentication.properties`.
-
-This approach allows configuration to be partitioned by component.  
-
-> It is also possible to externalize all configuration files so that they reside outside of `WEB-INF` directory; this is discussed [here](./externalized-configuration.html).
-
-## Specifying Components
-
-A running Isis instance requires a persistor (aka objectstore), an authentication mechanism, and an authorization mechanism.  It also requires some sort of viewer or viewers.
-
-The objectstore, authentication and authorization are specified in the `isis.properties` file.  For example, this is the configuration of the [simple](../intro/getting-started/simple-archetype.html) archetype:
-
-    isis.persistor=datanucleus
-    isis.authentication=shiro
-    isis.authorization=shiro
-
-The available values are registered in [installer-registry.properties](https://raw.githubusercontent.com/apache/isis/master/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties); alternatively the fully qualified class name can be specified.  In either case the appropriate component must also (of course) be added as a dependency to the `pom.xml` files.  
-
-The viewer is *not* specified in the `isis.properties` file; rather it is implied by the configuration of `WEB-INF/web.xml` file.  The archetypes are a good point of reference for the required servlet context listeners and servlets; every viewer has its own requirements.
-
-## Componentized configuration Files by component
-
-As noted in the introduction, the configuration can optionally be broken out by component and also component implementation.  
-
-This is also supported for the configured viewer(s).  However, because the configured viewer(s) is/are not listed in `isis.properties`, an additional hint is required in the `web.xml` file to tell Isis which viewers are in use.
-
-For example, to specify that the Wicket viewer and Restful Objects viewers are configured, specify:
-
-    <context-param>
-        <param-name>isis.viewers</param-name>
-        <param-value>wicket,restfulobjects</param-value>
-    </context-param>
-
-The table below summarizes the additional configuration files that are searched for the most commonly configured components:
-    
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-    <th>Component type</th>
-    <th>Component implementation</th>
-    <th>Additional configuration files</th>
-</tr>
-<tr>
-    <td>Object Store</td>
-    <td>JDO (DataNucleus)</td>
-    <td>persistor_datanucleus.properties<br/>
-persistor.properties</td>
-</tr>
-<tr>
-    <td>Authentication</td>
-    <td>Shiro</td>
-    <td>authentication_shiro.properties<br/>
-authentication.properties</td>
-</tr>
-<tr>
-    <td>Authorization</td>
-    <td>Shiro</td>
-    <td>authorization_shiro.properties<br/>
-authorization.properties</td>
-</tr>
-<tr>
-    <td>Viewer</td>
-    <td>Wicket</td>
-    <td>viewer_wicket.properties<br/>
-viewer.properties</td>
-</tr>
-<tr>
-    <td>Viewer</td>
-    <td>Restful Objects</td>
-    <td>viewer_restfulobjects.properties<br/>
-viewer.properties</td>
-</tr>
-</table>

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/deployment-type.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/deployment-type.md b/content-OLDSITE/reference/deployment-type.md
deleted file mode 100644
index f2fa519..0000000
--- a/content-OLDSITE/reference/deployment-type.md
+++ /dev/null
@@ -1,91 +0,0 @@
-Title: Deployment Types
-
-[//]: # (content copied to _user-guide_xxx)
-
-The `deploymentType` configuration setting is used to specify whether Isis is running in development mode or production mode (similar to Apache Wicket's concept of the application's [configuration type](http://ci.apache.org/projects/wicket/apidocs/6.0.x/org/apache/wicket/Application.html#getConfigurationType()).
-
-The most notable thing that varies by `deploymentType` is simply whether actions annotated with [@Prototype](./recognized-annotations/Prototype-deprecated.html) are visible.
-
-Each `deploymentType` list has a corresponding `deploymentCategory`, and it is this that determines whether `@Prototype` actions are visible:
-
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-<th>Deployment types</th>
-<th><tt>@Prototype<tt> actions</th>
-</tr>
-<tr>
-    <td>SERVER_PROTOTYPE</td>
-    <td>Visible</td>
-</tr>
-<tr>
-    <td>UNIT_TESTING</td>
-    <td>Not visible</td>
-</tr>
-<tr>
-    <td>SERVER</td>
-    <td>Not visible</td>
-</tr>
-</table>
-
-
-## Specifying the Deployment Type in the `web.xml` file
-
-> If running these viewers using the [WebServer](https://raw.githubusercontent.com/apache/isis/master/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java), then the `deploymentType` is forced to SERVER_PROTOTYPE; the value in the `web.xml` file is ignored.  Thus these settings only take force when deploying into a regular webapp server, eg Tomcat.
-
-#### Wicket
-
-For the [wicket](../components/viewers/wicket/about.html) viewer, the Isis `deploymentType` is inferred from [Apache Wicket](http://wicket.apache.org)'s own [deployment mode](http://ci.apache.org/projects/wicket/apidocs/6.x/org/apache/wicket/Application.html#getConfigurationType()):
-
-* Wicket's `DEVELOPMENT` mode corresponds to Isis' `PROTOTYPING` mode
-* Wicket's `DEPLOYMENT` mode corresponds to Isis' `PRODUCTION` mode
-
-The Wicket configuration type is set in the usual way for a Wicket application, for example:
-
-    <context-param>
-        <param-name>configuration</param-name>
-        <param-value>deployment</param-value>
-    </context-param>
-
-(Alternative ways of specifying the Wicket configuration type can be found [in this blog post](http://www.mysticcoders.com/blog/development-and-deployment-mode-how-to-configure-it/)).
-
-Note that if the Wicket configuration type is set to deployment, then any Wicket tags will automatically be stripped.  The presence of Wicket tags can occasionally trip up some browsers (we have noticed that Internet Explorer is particularly susceptible) and some Javascript components.  The Wicket viewer therefore also allows the stripping of Wicket tags to be forced (even in prototype mode) using a configuration setting described [here](../components/viewers/wicket/stripped-wicket-tags.html).
-
-#### Restful Objects viewer
-
-First thing to note is that, if [Restful Objects](../components/viewers/restfulobjects/about.html) viewer is deployed alongside the [Wicket](../components/viewers/wicket/about.html) viewer, then the Wicket viewer's configuration takes precedence.  See the section above for details.
-
-However, if the Restful Objects viewer is deployed by itself, then the `deploymentType` is specified in the `<web.xml>` file:
-
-    <context-param>
-        <param-name>deploymentType</param-name>
-        <param-value>SERVER</param-name>
-    </context-param>
-
-
-#### Scimpi viewer (not released)
-
-The [Scimpi](../components/viewers/scimpi/about.html) is configured the same way as the [Restful Objects](../components/viewers/restfulobjects/about.html) viewer, see above.
-
-## Running a web viewer using `WebServer`
-
-If running these viewers using the [WebServer](https://raw.githubusercontent.com/apache/isis/master/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java), then the `deploymentType` defaults to prototype; see below for more details.
-
-It is possible to explicitly specify the deployment mode at the command line:
-
-    -t server_prototype
-
-or using the long form:
-
-    --type server_exploration
-
-Only `server_*`-style `deploymentType`s should be specified (it has a bearing on the way that Isis does its session management).
-
-
-## Component Defaults
-
-If a component implementation is not specified explicitly, then the defaults are:
-
-* authentication=[shiro](../components/security/shiro/about.html)
-* authorization=[shiro](../components/security/shiro/about.html)
-* persistor=[datanucleus](../components/objectstores/jdo/about.html)
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/externalized-configuration.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/externalized-configuration.md b/content-OLDSITE/reference/externalized-configuration.md
deleted file mode 100644
index 9880ba1..0000000
--- a/content-OLDSITE/reference/externalized-configuration.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Title: Externalized Configuration
-
-[//]: # (content copied to _ug_deployment_externalized-configuration)
-
-As described [here](./configuration-files.html), Isis itself bootstraps from the `isis.properties` configuration file.
-It will also read configuration from the (optional) component/implementation-specific configuration files (such as
-`persistor_datanucleus.properties` or `viewer_wicket.properties`) and also (otional) component-specific configuration
-files (such as `persistor.properties` or `viewer.properties`).
-
-> By convention we put JDBC URL properties in `persistor.properties`, but they could reside in any of
-> `persistor_datanucleus.properties`, `persistor.properties` or (even) `isis.properties`
-
-By default these are read from the `WEB-INF` directory.  Having this configuration "baked into" the application is
-okay in a development environment, but when the app needs to be deployed to a test or production environment, this
-configuration should be read from an external location.
-
-There are in fact three frameworks involved here, all of which need to be pointed to this external location:
-
-* Apache Isis itself
-
-  which as already discussed reads `isis.properties` and optional component-specific config files.
-
-* [Apache Shiro](http://shiro.apache.org) (if using the Isis' [Shiro integration](../components/security/shiro/about.html) for authentication and/or authorization
-  
-  which reads the `shiro.ini` file (and may read other files referenced from that file)  
-
-* [Apache log4j 1.2](http://logging.apache.org/log4j/1.2), for logging
-
-  which reads `logging.properties` file
-  
-Each of these frameworks has its own way of externalizing its configuration.
-
-## <a name="isis">Externalizing Isis' Configuration</a>
-
-> Note that running the app from org.apache.isis.WebServer currently does not externalized Isis configuration.
-
-To tell Isis to load configuration from an external directory, specify the `isis.config.dir` context parameter.  
-
-If the external configuration directory is fixed for all environments (systest, UAT, prod etc), then you can specify within the `web.xml` itself:
-
-    <context-param>
-        <param-name>isis.config.dir</param-name>
-        <param-value>location of external config directory</param-value>
-    </context-param>
-
-If however the configuration directory varies by environment, then the context parameter will be specified to each installation of your servlet container.  Most (if not all) servlet containers will provide a means to define context parameters through proprietary config files.
-
-For example, if using Tomcat 7.0, you would typically copy the empty `$TOMCAT_HOME/webapps/conf/context.xml` to a file specific to the webapp, for example `$TOMCAT_HOME/webapps/conf/todo.xml`.  The context parameter would then be specified by adding the following:
-
-    <Parameter name="isis.config.dir"
-               value="/usr/local/tomcat/myapp/conf/"
-               override="true"/>
-
-For more detail, see the Tomcat documentation on [defining a context](http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Defining_a_context) and on [context parameters](http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters).
-     
-## <a name="shiro">Externalizing Shiro's Configuration</a>
-
-If using Isis' [Shiro integration](../components/security/shiro/about.html) for authentication and/or authorization, note that it reads from the `shiro.ini` configuration file.  By default this also resides in `WEB-INF`.
-
-Similar to Isis, Shiro lets this configuration directory be altered, by specifying the `shiroConfigLocations` context parameter.
-
-You can therefore override the default location using the same technique as described above for Isis' `isis.config.dir` context parameter.  For example:
-
-    <Parameter name="shiroConfigLocations" 
-               value="file:/usr/local/myapp/conf/shiro.ini" 
-               override="true" />
-
-> Note that Shiro is more flexible than Isis; it will read its configuration from any URL, not just a directory on the local filesystem. 
-
-
-## <a name="log4j">Externalizing Log4j's Configuration</a>
-
-By default Isis configures log4j to read the `logging.properties` file in the `WEB-INF` directory.  This can be overridden by setting the `log4j.properties` system property to the URL of the log4j properties file.
-
-For example, if deploying to Tomcat7, this amounts to adding the following to the `CATALINA_OPTS` flags:
-
-    export CATALINA_OPTS="-Dlog4j.configuration=/usr/local/tomcat/myapp/conf/logging.properties"
-
-Further details an be found in the [log4j documentation](https://logging.apache.org/log4j/1.2/manual.html#Example_Configurations).
-
-> `CATALINA_OPTS` was called `TOMCAT_OPTS` in earlier versions of Tomcat.
-
-## See also
-
-See [JVM args](./jvm-args.html) for other JVM args and system properties that you might want to consider setting.

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/images/Events.png
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/images/Events.png b/content-OLDSITE/reference/images/Events.png
deleted file mode 100644
index 67d1d35..0000000
Binary files a/content-OLDSITE/reference/images/Events.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/jvm-args.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/jvm-args.md b/content-OLDSITE/reference/jvm-args.md
deleted file mode 100644
index 72a262c..0000000
--- a/content-OLDSITE/reference/jvm-args.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: Suggested JVM args
-
-[//]: # (content copied to _ug_deployment_jvm-flags)
-
-The default JVM configuration will most likely not be appropriate for running Isis as a webapp.  Some args that you will 
-
-<table class="table table-striped table-bordered">
-<tr>
-    <th>Flag</th>
-    <th>Description</th>
-</tr>
-<tr>
-    <td>&#8209;server</td>
-    <td>Run the JVM in server mode, meaning that the JVM should spend more time on the optimization of the fragments of codes that are most often used (hotspots). This leads to better performance at the price of a higher overhead at startup</td>
-</tr>
-<tr>
-    <td>&#8209;Xms128m</td>
-    <td>Minimum heap size</td>
-</tr>
-<tr>
-    <td>&#8209;Xmx768m</td>
-    <td>Maximum heap size</td>
-</tr>
-<tr>
-    <td>&#8209;XX:PermSize=64m</td>
-    <td>Minimum perm size (for class definitions)</td>
-</tr>
-<tr>
-    <td>&#8209;XX:MaxPermSize=256m</td>
-    <td>Maximum perm size (for class definitions)</td>
-</tr>
-<tr>
-    <td>&#8209;XX:+DisableExplicitGC</td>
-    <td>Causes any explicit calls to <tt>System.gc()</tt> to be ignored.  See <a href="http://stackoverflow.com/questions/12847151/setting-xxdisableexplicitgc-in-production-what-could-go-wrong">this stackoverflow</a> question.</td>
-</tr>
-</table>
-   
-There are also a whole bunch of GC-related flags, that you might want to explore; see this detailed [Hotspot JVM](http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html) documentation and also this [blog post](http://blog.ragozin.info/2011/09/hotspot-jvm-garbage-collection-options.html).
-
-   
-## Configuring in Tomcat
-
-If using Tomcat, update the `CATALINA_OPTS` variable.
-
-> This variable is also updated if [configuring logging to run externally](./externalized-configuration.html#log4j).
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/non-ui/about.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/non-ui/about.md b/content-OLDSITE/reference/non-ui/about.md
deleted file mode 100644
index a562cc7..0000000
--- a/content-OLDSITE/reference/non-ui/about.md
+++ /dev/null
@@ -1,6 +0,0 @@
-title: Non-UI
-
-go back to: [documentation](../../documentation.html)
-
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/non-ui/background-command-execution.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/non-ui/background-command-execution.md b/content-OLDSITE/reference/non-ui/background-command-execution.md
deleted file mode 100644
index dab0339..0000000
--- a/content-OLDSITE/reference/non-ui/background-command-execution.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Title: BackgroundCommandExecution
-
-[//]: # (content copied to user-guide_background-execution)
-
-The `BackgroundCommandExecution` class (a subclass of [AbstractIsisSessionTemplate](./isis-session-template.html) is intended to simplify the execution of background `Command`s persisted by way of the [CommandService](../services/command-context.html) and the [BackgroundCommandService](../services/background-service.html).  Its signature is:
-
-    public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemplate {
-        protected void doExecute(Object context) { ... }
-        protected abstract List<? extends Command> findBackgroundCommandsToExecute();
-    }
-
-where:
-
-* `findBackgroundCommandsToExecute()` is a mandatory hook method for subclasses to implement.
-
-This allows for different implementations of the `CommandService` and `BackgroundCommandService` to persist to wherever.
-
-The diagram below shows the dependencies between these various classes:
-
-![](http://yuml.me/25343da1)
-
-
-## Related Classes
-
-The JDO object store provides its own (concrete) subclass, [BackgroundCommandExecutionFromBackgroundCommandServiceJdo](../../components/objectstores/jdo/non-ui/background-command-execution-jdo.html) that queries for persisted `Command`s (created either through [CommandServiceJdo](../../components/objectstores/jdo/services/command-service-jdo.html) or through [BackgroundCommandServiceJdo](../../components/objectstores/jdo/services/background-command-service-jdo.html)), using the corresponding repository.
-
-
-#### neat!
-The diagram on this page were created using [yuml.me](http://yuml.me). 
-
-DSL ([edit](http://yuml.me/edit/25343da1)):
-
-    [AbstractIsisSessionTemplate|#doExecute()]^-[BackgroundCommandExecution|#findBackgroundCommandsToExecute()]
-    [BackgroundCommandExecution]->injected[BookmarkService|lookup()]
-    [BackgroundCommandExecution]->injected[CommandContext|setCommand()]

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/non-ui/isis-session-template.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/non-ui/isis-session-template.md b/content-OLDSITE/reference/non-ui/isis-session-template.md
deleted file mode 100644
index a8a6347..0000000
--- a/content-OLDSITE/reference/non-ui/isis-session-template.md
+++ /dev/null
@@ -1,41 +0,0 @@
-Title: AbstractIsisSessionTemplate
-
-[//]: # (content copied to user-guide_background-execution)
-
-{note
-This class is only semi-formalized, and may change (in small ways) over time.
-}
-
-The `AbstractIsisSessionTemplate` class (whose name is inspired by the Spring framework's naming convention for similar classes that query [JDBC](http://docs.spring.io/spring/docs/2.5.x/reference/jdbc.html#jdbc-JdbcTemplate), [JMS](http://docs.spring.io/spring/docs/2.5.x/reference/jms.html#jms-jmstemplate), [JPA](http://docs.spring.io/spring/docs/2.5.x/reference/orm.html#orm-jpa-template) etc) provides the mechanism to open up a 'session' within the Isis framework, in order to resolve and interact with entities.
-
-This is a low-level API that circumvents any UI concerns, and allows code to interact very directly with the Isis metamodel and runtime.  Typical use cases are to support batch execution or background scheduler execution.  It could also be used to run Isis as a service, or to integrate within JMS/ESB messaging solutions.
-
-The class itself is intended to be subclassed:
-
-
-    public abstract class AbstractIsisSessionTemplate {
-
-        public void execute(final AuthenticationSession authSession, final Object context) { ... }
-        protected abstract void doExecute(Object context);
-
-        protected ObjectAdapter adapterFor(final Object targetObject) { ... }
-        protected ObjectAdapter adapterFor(final RootOid rootOid) { ... }
-        
-        protected PersistenceSession getPersistenceSession() { ... }
-        protected IsisTransactionManager getTransactionManager() { ... }
-        protected AdapterManager getAdapterManager() { ... }
-
-    }
-
-where `execute(...)` sets up the `IsisSession` and delegates to `doExecute(...)`, the mandatory hook method for subclasses to implement.  The passed object represents passes a context from the caller (eg the scheduler, cron job, JMS etc) that instantiated and executed the class.
-
-The `protected` methods expose key internal APIs within Isis, for the subclass to use as necessary.
-
-### Auto-injection
-
-One notable feature of `AbstractIsisSessionTemplate` is that it will automatically inject any domain services into itself.  Thus, it is relatively easy for the subclass to "reach into" the domain, through injected repository services.
-
-### Related classes
-
-The [BackgroundCommandExecution](./background-command-execution.html) class is a subclass of `AbstractIsisSessionTemplate`, designed to execute [background commands](../services/background-service.html)).  The `BackgroundCommandExecutionFromBackgroundCommandServiceJdo` (a further subclass) obtains the commands from the `BackgroundCommandJdoServiceRepository`.
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/object-lifecycle-callbacks.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/object-lifecycle-callbacks.md b/content-OLDSITE/reference/object-lifecycle-callbacks.md
deleted file mode 100644
index ec23815..0000000
--- a/content-OLDSITE/reference/object-lifecycle-callbacks.md
+++ /dev/null
@@ -1,62 +0,0 @@
-Object lifecycle callbacks
---------------------------
-
-[//]: # (content copied to _user-guide_xxx)
-
-Isis supports a number of callback methods corresponding to the persistence lifecycle of the object.
-
-They are:
- 
-<table class="table table-striped table-bordered table-condensed">
-<tr>
-    <th>Method</th>
-    <th>Called?</th>
-    <th>Notes</th>
-</tr>
-<tr>
-    <td><tt>created()</tt></td>
-    <td>After the object has been instantiated with <tt>DomainObjectContainer#newTransientInstance()</tt></td>
-    <td></td>
-</tr>
-<tr>
-    <td><tt>persisting()</tt></td>
-    <td>Before the object is persisted for the first time (INSERTed) into the object store</td>
-    <td><tt>saving()</tt> is also supported, but is deprecated</td>
-</tr>
-<tr>
-    <td><tt>persisted()</tt></td>
-    <td>After the object has been persisted for the first time (INSERTed) into the object store</td>
-    <td><tt>saved()</tt> is also supported, but is deprecated</td>
-</tr>
-<tr>
-    <td><tt>loading()</tt></td>
-    <td>Before the object is retrieved (resolved) from the object store</td>
-    <td></td>
-</tr>
-<tr>
-    <td><tt>loaded()</tt></td>
-    <td>After the object is retrieved (resolved) from the object store</td>
-    <td></td>
-</tr>
-<tr>
-    <td><tt>updating()</tt></td>
-    <td>Before the changed object is flushed (UPDATEd) to the object store</td>
-    <td></td>
-</tr>
-<tr>
-    <td><tt>updated()</tt></td>
-    <td>After the changed object is flushed (UPDATEd) to the object store</td>
-    <td></td>
-</tr>
-<tr>
-    <td><tt>removing()</tt></td>
-    <td>Before a removed object (through <tt>DomainObjectContainer#remove()</tt>) is removed (DELETEd) from the object store</td>
-    <td><tt>deleting()</tt> is also supported, but is deprecated</td>
-</tr>
-<tr>
-    <td><tt>removed()</tt></td>
-    <td>After a removed object has been removed (DELETEd) from the object store</td>
-    <td><tt>deleted()</tt> is also supported, but is deprecated</td>
-</tr>
-</table>
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/Action.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/Action.md b/content-OLDSITE/reference/recognized-annotations/Action.md
deleted file mode 100644
index fd364bf..0000000
--- a/content-OLDSITE/reference/recognized-annotations/Action.md
+++ /dev/null
@@ -1,409 +0,0 @@
-Title: @Action
-
-[//]: # (content copied to _user-guide_xxx)
-
-The `Action` annotation groups together all domain-specific metadata for an invokable action on a domain object or domain service:
-
-* `domainEvent` - specifies the subtype of the `ActionDomainEvent` that should be posted to the [Event Bus service](../services/event-bus-service.htm) to broadcast the action's business rule checking (hide, disable, validate) and its invocation (pre-execute and post-execution).
-
-* `hidden` -  indicates where (in the UI) the action is not visible to the user.
-
-* `semantics` - the action's semantics, either safe (query-only), idempotent or non-idempotent.
-
-* `invokeOn` - whether an action can be invoked on a single object and/or on many objects in a collection.
-
-* `command` - whether the action invocation should be reified into a `org.apache.isis.applib.services.command.Command` object.
-
-* `commandPersistence` - how the reified `Command` (as provided by the `CommandContext` domain service) should be persisted.
-
-* `commandExecuteIn` - how the command/action should be executed: foreground or background.
-
-* `publishing` - whether changes to the object should be published to the registered [publishing service](../publishing-service.html).
-
-* `publishingPayloadFactory` - specifies that a custom implementation of `PublishingPayloadFactoryForAction` be used to create the (payload of the) published event
-
-* `typeOf` - if the action returns a collection, specifies the type of the objects within that collection
-
-* `restrictTo` - whether the action is restricted to prototyping
-
-
-
-## Domain events
-
-Every interaction with a domain object action causes multiple events to be fired, in the following phases:
-
-* Hide phase: to check that the action is visible (has not been hidden)
-
-* Disable phase: to check that the action is usable (has not been disabled)
-
-* Validate phase: to check that the action's arguments are valid
-
-* Pre-execute phase: before the invocation of the action
-
-* Post-execute: after the invocation of the action
-
-Subscribers subscribe through the [Event Bus Service](../services/event-bus-service.html) 
-using Guava annotations and can influence each of these phases.
-
-By default the event raised is `ActionDomainEvent.Default`.  For example:
-
-    public class ToDoItem {
-        ...
-        @Action()
-        public ToDoItem completed() { ... }
-    }
-
-Optionally a subclass can be declared:
-
-    public class ToDoItem {
-
-        public static class CompletedEvent extends AbstractActionDomainEvent {
-            private static final long serialVersionUID = 1L;
-            public CompletedEvent(
-                    final ToDoItem source,
-                    final Identifier identifier,
-                    final Object... arguments) {
-                super("completed", source, identifier, arguments);
-            }
-        }
-
-        @Action(domainEvent=CompletedEvent.class)
-        public ToDoItem completed() { ... }
-
-    }
-
-#### Subscribers
-
-Subscribers (which must be domain services) subscribe using the Guava API.
-Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
-
-    @DomainService
-    public class SomeSubscriber {
-
-        @Programmatic
-        @com.google.common.eventbus.Subscribe
-        public void on(ActionInteractionEvent ev) {
-
-            ...
-        }
-
-    }
-
-or can be fine-grained by subscribing to specific event subtypes:
-
-    @DomainService
-    public class SomeSubscriber {
-
-        @Programmatic
-        @com.google.common.eventbus.Subscribe
-        public void on(ToDoItem.CompletedEvent ev) {
-
-            ...
-        }
-
-    }
-
-The subscriber's method is called (up to) 5 times:
-
-* whether to veto visibility (hide)
-* whether to veto usability (disable)
-* whether to veto execution (validate)
-* steps to perform prior to the action being invoked.
-* steps to perform after the action has been invoked.
-
-The subscriber can distinguish these by calling `ev.getEventPhase()`.  Thus the general form is:
-
-    @Programmatic
-    @com.google.common.eventbus.Subscribe
-    public void on(ActionInteractionEvent ev) {
-
-        switch(ev.getPhase()) {
-            case HIDE:
-                ...
-                break;
-            case DISABLE:
-                ...
-                break;
-            case VALIDATE:
-                ...
-                break;
-            case EXECUTING:
-                ...
-                break;
-            case EXECUTED:
-                ...
-                break;
-        }
-    }
-
-Vetoing is performed by calling the appropriate method on the event:
-
-* To hide:
-
-    `ev.hide()`
-
-    or
-
-    `ev.veto("")`
-
-* To disable:
-
-    `ev.disable("...");`
-
-    or
-
-    `ev.veto("...");`
-
-* To invalidate:
-
-     `ev.invalidate("...");`
-
-     or
-
-    `ev.veto("...");`
-
-It is also possible to abort the transaction during the executing or executed
-phases by throwing an exception.  If the exception is a subtype of `RecoverableException`
-then the exception will be rendered as a user-friendly warning (eg Growl/toast)
-rather than an error.
-
-
-#### Raising events programmatically.
-
-Normally events are only raised for interactions through the UI.  However, events can be raised programmatically by
-wrapping the target object using the [Wrapper Factory](../services/wrapper-factory.html) service.
-
-
-
-## Hidden
-
-Actions can be hidden at the domain-level, indicating that they are not visible to the end-user.  For example:
-
-    public class Customer {
-
-        @Action(hidden=EVERYWHERE)
-        public void updateStatus() { ... }
-        ...
-    }
-
-The only value that currently makes sense is `EVERYWHERE` (or its synonym `ANYWHERE`).
-
-#### See also
-
-It is also possible to use `@ActionLayout` or [dynamic layouts](../../components/viewers/wicket/dynamic-layouts.html)
-such that the action can be hidden at the view layer.  Both options are provided with a view that in the future the
-view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics cannot be overridden
-or modified by the user.
-
-For `DomainService` actions, the action's visibility is dependent upon its `DomainService#nature()` and for contributed
-actions on how it is `ActionLayout#contributed()`.
-
-
-## Semantics
-
-This annotation, which applies only to actions, describes whether the
-invocation is safe (as no side-effects), is idempotent (may have
-side-effects but always has the same postconditions), or is neither safe
-nor idempotent. If the annotation is missing then the framework assumes
-non-idempotent.
-
-For example:
-
-    public class Customer {
-        @Action(semantics=SemanticsOf.SAFE)
-        public CreditRating checkCredit() { ... }
-
-        @Action(semantics=SemanticsOf.IDEMPOTENT)
-        public void changeOfAddress(Address address) { ... }
-
-        @Action(semantics=SemanticsOf.NON_IDEMPOTENT)
-        public Order placeNewOrder() { ... }
-        ...
-    }
-
-The annotation was introduced for the restfulobjects viewer in order
-that action invocations could be made available using either HTTP GET,
-PUT or POST (respectively). It is now also used in core runtime's
-in-built concurrency checking; the invocation of a safe action does not
-perform a concurrency check, whereas non-safe actions do perform a
-concurrency check.
-
-
-## Invoke On
-
-Indicates whether the an action can be invoked on a single object (the default) and/or on many objects in a collection.
-
-Actions to be invoked on collection (currently) have a number of constraints:
-
-* It must take no arguments
-* It cannot be hidden (any annotations or supporting methods to that effect will be  ignored
-*It cannot be disabled (any annotations or supporting methods to that effect will be ignored).
-
-This attribute has no meaning if annotated on an action of a domain service.
-
-
-
-## Command
-
-Using `@Action(command=...)` allows an action invocation to be made into a concrete object such that it can be
-inspected and persisted, for various purposes.  These include enhanced profiling/auditing, as well as being able to
-defer the execution of the action and have it be invoked in the background.
-
-The annotation works (and influences the behaviour of) the `CommandContext`, `CommandService`, `BackgroundService` and
-`BackgroundCommandService` domain services (documented [here](../../../reference/services/command-context.html) and
-[here](../../../reference/services/background-service.html)).
-
-By default, actions are invoked in directly in the thread of the invocation.
-
-Each action invocation is reified by the `CommandContext` service into a `Command` object,
-capturing details of the target object, the action, the parameter arguments, the user, a timestamp and so on.
-
-If an appropriate `CommandService` service is configured (for example the
-[CommandServiceJdo](../../../components/objectstores/jdo/services/command-service-jdo.html) JDO implementation), then
-the `Command` itself is persisted.
-
-If the `BackgroundService` is configured, then commands can be invoked by means of a separate background process.  If an appropriate `BackgroundCommandService` service is configured (for example, the [BackgroundCommandServiceJdo](../../../components/objectstores/jdo/services/background-command-service-jdo.html) JDO implementation), then the background command is persisted.
-
-### `command()`
-
-The `command()` attribute determines whether the action invocation should be reified into a `Command` object (by the `CommandContext` service).
-
-The default is `AS_CONFIGURED`, meaning that the configuration property:
-
-    isis.services.command.actions
-
-is used to determine the whether the action is reified:
-
-* `all` - all actions are reified
-* `ignoreSafe` (or `ignoreQueryOnly`) - actions with safe (read-only) semantics are ignored, but actions which may modify data are not ignored
-* `none` - no actions are reifired.
-
-This default can be overridden on an action-by-action basis; if `command()` is set to `ENABLED` then the action is reified irrespective of the configured value; if set to `DISABLED` then the action is NOT reified irrespective of the configured value.
-
-
-The `@Action(command=...)` annotation can be annotated on action methods, to influence this behaviour:
-
-    public class Order {
-
-        @Action(command=CommandReification.ENABLED)
-        public Invoice generateInvoice(...) { ... }
-
-    }
-
-corresponds to the behaviour described above; the `Command` object is persisted (assuming an appropriate `CommandService` is defined, and executed immediately in the foreground).
-
-
-### `commandPersistence()`
-
-If the action has been reified, then the `commandPersistence()` attribute determines whether that `Command` object
-should then also be persisted (the default), or not persisted, or only if hinted.
-
-To explain this last alternative:
-
-    public class Order {
-
-        @Action(
-            command=CommandReification.ENABLED,
-            commandPersistence=CommandPersistence.IF_HINTED)
-        public Invoice generateInvoice(...) { ... }
-
-    }
-
-will suppress the persistence of the `Command` object *unless* a child background `Command` has been created in the body of the action by way of the `BackgroundService`.
-
-Next:
-
-    public class Order {
-
-        @Command(
-            command=CommandReification.ENABLED,
-            commandExecuteIn=CommandExecuteIn.FOREGROUND,
-            commandPersistence=CommandPersistence.NOT_PERSISTED)
-        public Invoice generateInvoice(...) { ... }
-
-    }
-
-will prevent the parent `Command` object from being persisted, *even if* a child background `Command` is created.
-
-
-### `commandExecuteIn()`
-
-For persisted commands, the `commandExecuteIn()` attribute determines whether the `Command` should be executed in the
-foreground (the default) or executed in the background.
-
-Background execution means that the command is not executed immediately, but is available for a configured
-[background service](../services/background-service.html) to execute, eg by way of an in-memory scheduler such as Quartz.
-
-For example:
-
-    public class Order {
-
-        @Action(
-            command=CommandReification.ENABLED,
-            commandExecuteIn=CommandExecuteIn.BACKGROUND)
-        public Invoice generateInvoice(...) { ... }
-
-    }
-
-will result in the `Command` being persisted but its execution deferred to a background execution mechanism.  The
-returned object from this action is the persisted `Command` itself.
-
-
-## Publishing
-
-Publishing is managed by the `publishing()` and `publishingPayloadFactory()` attributes.
-
-### `publishing()`
-
-Indicates whether the action invocation should be published to the [publishing service](../publishing-service.html).
-
-The default is `AS_CONFIGURED`, meaning that the configuration property:
-
-    isis.services.publish.actions
-
-is used to determine the whether the action is published:
-
-* `all` - all actions are published
-* `ignoreSafe` (or `ignoreQueryOnly`) - actions with safe (read-only) semantics are ignored, but actions which may modify data are not ignored
-* `none` - no actions are published
-
-This default can be overridden on an action-by-action basis; if `command()` is set to `ENABLED` then the action is reified irrespective of the configured value; if set to `DISABLED` then the action is NOT reified irrespective of the configured value.
-
-### `publishingPayloadFactory()`
-
-The `publishingPayloadFactory()` specifies the class to use to create the (payload of the) event to be published by the publishing factory.
-Rather than simply broadcast that the action was invoked, the payload factory allows a "fatter" payload to be isntantiated
-that can eagerly push commonly-required information to all subscribers.  For at least some subscribers this should avoid
-the necessity to query back for additional information.
-
-
-
-## `typeOf()`
-
-Specifies the type-of the elements returned by the action.
-
-
-## `restrictTo()`
-
-Whether the action is restricted to prototyping.
-
-By default there are no restrictions, with the action being available in all environments.
-
-## See also
-
-Other domain semantics:
-
-* [@Property](./Property.html)
-* [@Collection](./Collection.html)
-* [@Action](./Action.html)
-* [@Parameter](./Parameter.html)
-* [@DomainObject](./DomainObject.html)
-* [@DomainService](./DomainService.html)
-* [@ViewModel](./ViewModel.html)
-
-Corresponding view layer ("Layout") annotation:
-
-* [@ActionLayout](./ActionLayout.html)
-
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/ActionInteraction.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/ActionInteraction.md b/content-OLDSITE/reference/recognized-annotations/ActionInteraction.md
deleted file mode 100644
index dc4e5d7..0000000
--- a/content-OLDSITE/reference/recognized-annotations/ActionInteraction.md
+++ /dev/null
@@ -1,135 +0,0 @@
-Title: @ActionInteraction
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@Action#domainEvent()](./Action.html).
-
-The `@ActionInteraction` annotation applies to domain entity actions, allowing
-subscribers to optionally veto, validate or otherwise perform tasks before 
-or after the action has been invoked.
-
-Subscribers subscribe through the [Event Bus Service](../services/event-bus-service.html) using Guava annotations.
-
-By default the event raised is `ActionInteractionEvent.Default`.  For example:
-
-    public class ToDoItem {
-        ...     
-        @ActionInteraction
-        public ToDoItem completed() { ... }
-    }
-
-Optionally a subclass can be declared:
-
-    public class ToDoItem {
-    
-        public static class CompletedEvent extends AbstractActionInteractionEvent {
-            private static final long serialVersionUID = 1L;
-            public CompletedEvent(
-                    final ToDoItem source, 
-                    final Identifier identifier, 
-                    final Object... arguments) {
-                super("completed", source, identifier, arguments);
-            }
-        }
-        
-        @ActionInteraction(CompletedEvent.class)
-        public ToDoItem completed() { ... }
-        
-    }
-
-
-## Subscribers
-
-Subscribers (which must be domain services) subscribe using the Guava API.  
-Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
-
-    @DomainService
-    public class SomeSubscriber {
-
-        @Programmatic
-        @com.google.common.eventbus.Subscribe
-        public void on(ActionInteractionEvent ev) {
-        
-            ...
-        }
-        
-    }
-    
-or can be fine-grained by subscribing to specific event subtypes:
-
-    @DomainService
-    public class SomeSubscriber {
-
-        @Programmatic
-        @com.google.common.eventbus.Subscribe
-        public void on(ToDoItem.CompletedEvent ev) {
-        
-            ...
-        }
-        
-    }
-
-The subscriber's method is called (up to) 5 times:
-
-* whether to veto visibility (hide)
-* whether to veto usability (disable)
-* whether to veto execution (validate)
-* steps to perform prior to the action being invoked.
-* steps to perform after the action has been invoked.
-
-The subscriber can distinguish these by calling `ev.getPhase()`.  Thus the general form is:
-
-    @Programmatic
-    @com.google.common.eventbus.Subscribe
-    public void on(ActionInteractionEvent ev) {
-        
-        switch(ev.getPhase()) {
-            case HIDE:
-                ...
-                break;
-            case DISABLE:
-                ...
-                break;
-            case VALIDATE:
-                ...
-                break;
-            case EXECUTING:
-                ...
-                break;
-            case EXECUTED:
-                ...
-                break;
-        }
-    }
-
-Vetoing is performed by calling the appropriate method on the event:
-
-* To hide:
-
-    ev.hide()
-    
-* To disable:
-
-    ev.disable("...");
-
-* To invalidate:
-
-    ev.invalidate("...");
-
-It is also possible to abort the transaction during the executing or executed
-phases by throwing an exception.  If the exception is a subtype of `RecoverableException` 
-then the exception will be rendered as a user-friendly warning (eg Growl/toast)
-rather than an error.
-
-    
-## Raising events programmatically.
-
-Normally events are only raised for interactions through the UI.  However, events can be raised programmatically by
-wrapping the target object using the [Wrapper Factory](../services/wrapper-factory.html) service.
-
-
-## See also
-
-Interaction events can also be raised for [properties](./PropertyInteraction.html) and [collections](./CollectionInteraction.html).
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/ActionLayout.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/ActionLayout.md b/content-OLDSITE/reference/recognized-annotations/ActionLayout.md
deleted file mode 100644
index a4f2b55..0000000
--- a/content-OLDSITE/reference/recognized-annotations/ActionLayout.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Title: @ActionLayout (1.8.0)
-
-[//]: # (content copied to _user-guide_xxx)
-
-The `@ActionLayout` annotation applies to actions, collecting together all UI hints within a single
-annotation.
-
-
-## See also
-
-Similar layout annotations exist for other elements of the metamodel:
-
-* [@PropertyLayout](./PropertyLayout.html) for properties
-* [@CollectionLayout](./CollectionLayout.html) for collections
-* [@ParameterLayout](./ParameterLayout.html) for action parameters
-* [@DomainObjectLayout](./DomainObjectLayout.html)
-* [@DomainServiceLayout](./DomainServiceLayout.html)
-* [@ViewModelLayout](./ViewModelLayout.html)
-
-Corresponding domain semantics:
-
-* [@Action](./Action.html)
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/ActionOrder-deprecated.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/ActionOrder-deprecated.md b/content-OLDSITE/reference/recognized-annotations/ActionOrder-deprecated.md
deleted file mode 100644
index 32ef779..0000000
--- a/content-OLDSITE/reference/recognized-annotations/ActionOrder-deprecated.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Title: @ActionOrder
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@MemberOrder#sequence()](./MemberOrder.html) or [dynamic layouts](../../components/viewers/wicket/dynamic-layouts.html).
-
-`@ActionOrder` provides a mechanism to specify the order in which
-actions appear in the user interface, in which the order is specified in
-one place in the class.
-
-For example:
-
-    @ActionOrder("PlaceNewOrder, CheckCredit")
-    public class Customer {
-
-        public Order placeNewOrder() {}
-
-        public CreditRating checkCredit() {}
-
-    ...
-    }
-
-The action names are not case sensitive.
-
-Compared to `@MemberOrder`, there is (currently) one additional advantage
-in that you can easily specify groupings (which may be rendered by the
-viewer as sub-menus). This information may be used by the viewing
-mechanism to render actions into sub-menus.
-
-For example:
-
-    @ActionOrder("(Account Management: PlaceOrder, CheckCredit), (Personal Details: ChangeOfAddress, AddEmail)")
-    public class Customer {
-        public CreditRating checkCredit() { ... }
-        public void changeOfAddress() { ... }
-        public Order placeNewOrder() { ... }
-        public void addEmail(String emailAddress) { ... }
-        ...
-    }
-
-However, `@ActionOrder` is more 'brittle' to change: if you change the
-name of an existing action you will need to ensure that the
-corresponding name within the `@ActionOrder` annotation is also changed.  For this reason we recommend you use `@MemberOrder` instead.
-
-
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/ActionSemantics.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/ActionSemantics.md b/content-OLDSITE/reference/recognized-annotations/ActionSemantics.md
deleted file mode 100644
index 2e2719c..0000000
--- a/content-OLDSITE/reference/recognized-annotations/ActionSemantics.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Title: @ActionSemantics
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@Action#semantics()](./Action.html).
-
-This annotation, which applies only to actions, describes whether the
-invocation is safe (as no side-effects), is idempotent (may have
-side-effects but always has the same postconditions), or is neither safe
-nor idempotent. If the annotation is missing then the framework assumes
-non-idempotent.
-
-For example:
-
-    public class Customer {
-        @ActionSemantics(Of.SAFE)
-        public CreditRating checkCredit() { ... }
-
-        @ActionSemantics(Of.IDEMPOTENT)
-        public void changeOfAddress(Address address) { ... }
-
-        @ActionSemantics(Of.NON_IDEMPOTENT)
-        public Order placeNewOrder() { ... }
-        ...
-    }
-
-The annotation was introduced for the restfulobjects viewer in order
-that action invocations could be made available using either HTTP GET,
-PUT or POST (respectively). It is now also used in core runtime's
-in-built concurrency checking; the invocation of a safe action does not
-perform a concurrency check, whereas non-safe actions do perform a
-concurrency check.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/Aggregated.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/Aggregated.md b/content-OLDSITE/reference/recognized-annotations/Aggregated.md
deleted file mode 100644
index 61b1caa..0000000
--- a/content-OLDSITE/reference/recognized-annotations/Aggregated.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Title: @Aggregated
-
-[//]: # (content copied to _user-guide_xxx)
-
-
-> This annotation has partial/incomplete support.
-
-This annotation indicates that the object is aggregated, or wholly owned, by a root object.
-
-This information could in theory provide useful semantics for some object store implementations, eg to store the aggregated objects "inline".  The JDO ObjectStore does *not* use this semantic, however.
-
-At the time of writing none of the viewers exploit this metadata.
-

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/Audited.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/Audited.md b/content-OLDSITE/reference/recognized-annotations/Audited.md
deleted file mode 100644
index a701088..0000000
--- a/content-OLDSITE/reference/recognized-annotations/Audited.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Title: @Audited
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@DomainObject#auditing()](./DomainObject.html).
-
-This annotation, which applies only to objects, indicates that if the
-object is modified, then it should be submitted to the
-`AuditingService`, if one has been configured.
-
-For example:
-
-    @Audited
-    public class Customer extends AbstractDomainObject {
-       ....
-    }
-
-The `AuditingService` is defined within the applib (in the
-`org.apache.isis.applib.services.audit` package):
-
-    public interface AuditingService {
-        @Hidden
-        public void audit(String user, long currentTimestampEpoch, String objectType, String identifier, String preValue, String postValue);
-    }
-
-At the time of writing only the JDO Object Store supported this
-annotation. Check with the documentation of the object store or ask on
-the mailing list to determine whether auditing is supported for other object stores.

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/AutoComplete.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/AutoComplete.md b/content-OLDSITE/reference/recognized-annotations/AutoComplete.md
deleted file mode 100644
index 174744a..0000000
--- a/content-OLDSITE/reference/recognized-annotations/AutoComplete.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Title: @AutoComplete
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@DomainObject#autoCompleteRepository](./DomainObject.html).
-
-This annotation is to support an auto-complete capability for reference
-properties and action parameters, the idea being that the user enters a
-few characters to locate a reference, and these are shown - for example
-- in a drop-down list box.
-
-The annotation is specified on the type, and specifies an action on a
-repository; this action should take a single string and should return a
-list of the type.
-
-For example:
-
-    @AutoComplete(repository=Customers.class, action="autoComplete")
-    public class Customer extends AbstractDomainObject {
-       ....
-    }
-
-where:
-
-    public interface Customers {
-
-        @Hidden
-        List<Customer> autoComplete(String search);
-        ...
-    }
-
->{note
-In many cases you may require additional control.  For this, you can use the `autoComplete` method prefix, associated either with [action parameter](../../how-tos/how-to-03-025-How-to-specify-an-autocomplete-for-an-action-parameter.html) or with the [property](../../how-tos/how-to-03-015-How-to-specify-an-autocomplete-for-a-property.html).
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis-site/blob/365806f1/content-OLDSITE/reference/recognized-annotations/Bookmarkable.md
----------------------------------------------------------------------
diff --git a/content-OLDSITE/reference/recognized-annotations/Bookmarkable.md b/content-OLDSITE/reference/recognized-annotations/Bookmarkable.md
deleted file mode 100644
index f5d7964..0000000
--- a/content-OLDSITE/reference/recognized-annotations/Bookmarkable.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Title: @Bookmarkable
-
-[//]: # (content copied to _user-guide_xxx)
-
-> Deprecated, use instead [@DomainObjectLayout#bookmarking()](./DomainObjectLayout.html) and [@ActionLayout#bookmarking()](./ActionLayout.html)  
-
-The `@Bookmarkable` annotation indicates that an entity or an action (with safe [action semantics](./ActionSemantics.html)) is automatically bookmarked.
-
-(In the Wicket viewer), a link to a bookmarked object is shown in the bookmarks panel that slides out from the left:
-
-<img src="images/Bookmarkable.png" width="640px"/>
- 
-For example:
-
-    @Bookmarkable
-    public class ToDoItem ... {
-        ...
-    }
-
-indicates that the `ToDoItem` class is bookmarkable, while:
-
-    @Named("ToDos")
-    public class ToDoItems {
-
-        @Bookmarkable
-        @ActionSemantics(Of.SAFE)
-        @MemberOrder(sequence = "1")
-        public List<ToDoItem> notYetComplete() {
-            ...
-        }
-        
-    }
-
-indicates that the "not yet complete" action is bookmarkable.
-
-It is also possible to nest bookmarkable entities.  For example, this screenshot is taken from [Estatio](http://github.com/estatio/estatio):
-
-<img src="images/Bookmarkable-nested.png" width="640px"/>
-
-For example, the `Property` entity "[OXF] Oxford Super Mall" is a root bookmark (the default), but the `Unit` child entity "[OXF-001] Unit 1" only appears as a bookmark if its parent `Property` has already been visited.  This is accomplished with the following annotations:
-
-    @Bookmarkable
-    public class Property { ... }
-    
-and
-
-    @Bookmarkable(BookmarkPolicy.AS_CHILD)
-    public abstract class Unit { ... }
-
-The nesting can be done to any level; the Estatio screenshot also shows a bookmark nesting 3 deep: `Lease` -> `LeaseItem` -> `LeaseTerm`.
-